rpms/opyum/F-7 opyum-0.0.3-configure.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 opyum.spec, 1.1, 1.2 sources, 1.2, 1.3 opyum, 1.1, NONE opyum-0.0.2-configure.patch, 1.1, NONE

Debarshi Ray (rishi) fedora-extras-commits at redhat.com
Fri Oct 26 21:43:42 UTC 2007


Author: rishi

Update of /cvs/pkgs/rpms/opyum/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23186

Modified Files:
	.cvsignore opyum.spec sources 
Added Files:
	opyum-0.0.3-configure.patch 
Removed Files:
	opyum opyum-0.0.2-configure.patch 
Log Message:
Updated to 0.0.3-1 in F-7.

 Modified Files:
 	.cvsignore opyum.spec sources 
 Added Files:
 	opyum-0.0.3-configure.patch 
 Removed Files:
 	opyum opyum-0.0.2-configure.patch 


opyum-0.0.3-configure.patch:

--- NEW FILE opyum-0.0.3-configure.patch ---
diff -urNp opyum-0.0.2.orig/configure opyum-0.0.2/configure
--- opyum-0.0.2.orig/configure	2007-08-23 06:59:36.000000000 +0530
+++ opyum-0.0.2/configure	2007-08-23 08:29:29.000000000 +0530
@@ -2307,34 +2307,6 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" 
 
 
 
-    if test -z $PYTHON;
-    then
-        PYTHON="python"
-    fi
-    PYTHON_NAME=`basename $PYTHON`
-    { echo "$as_me:$LINENO: checking $PYTHON_NAME module: pirut" >&5
-echo $ECHO_N "checking $PYTHON_NAME module: pirut... $ECHO_C" >&6; }
-        $PYTHON -c "import pirut" 2>/dev/null
-        if test $? -eq 0;
-        then
-                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                eval HAVE_PYMOD_PIRUT=yes
-        else
-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                eval HAVE_PYMOD_PIRUT=no
-                #
-                if test -n "fatal"
-                then
-                        { { echo "$as_me:$LINENO: error: failed to find required module pirut" >&5
-echo "$as_me: error: failed to find required module pirut" >&2;}
-   { (exit 1); exit 1; }; }
-                        exit 1
-                fi
-        fi
-
-
 GETTEXT_PACKAGE=opyum
 
 { echo "$as_me:$LINENO: checking whether ln -s works" >&5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opyum/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Oct 2007 20:08:45 -0000	1.2
+++ .cvsignore	26 Oct 2007 21:43:09 -0000	1.3
@@ -1 +1 @@
-opyum-0.0.2.tar.gz
+opyum-0.0.3.tar.gz


Index: opyum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opyum/F-7/opyum.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opyum.spec	14 Oct 2007 20:08:45 -0000	1.1
+++ opyum.spec	26 Oct 2007 21:43:09 -0000	1.2
@@ -2,20 +2,20 @@
 
 Summary: Offline package installation and update tools
 Name: opyum
-Version: 0.0.2
-Release: 2%{?dist}
+Version: 0.0.3
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/opyum
 Source0: http://rishi.fedorapeople.org/opyum/%{name}-%{version}.tar.gz
-Source1: %{name}
 
 Patch0: %{name}-%{version}-configure.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: hicolor-icon-theme
-Requires: pirut >= 1.3.11
+Requires: pirut >= 1.3.23
+Requires: usermode
 
 BuildRequires: desktop-file-utils
 BuildRequires: python
@@ -42,24 +42,32 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Workaround for Red Hat Bugzilla bug #252136.
-mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-start
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
+desktop-file-install --vendor fedora --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  ./data/%{name}.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/system-install-yumpacks.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post 
+if [ -x %{_bindir}/update-desktop-database ]; then
+  update-desktop-database &> /dev/null || :
+fi
+
 touch  --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun 
+if [ -x %{_bindir}/update-desktop-database ]; then
+  update-desktop-database &> /dev/null || :
+fi
+
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -67,10 +75,15 @@
 
 %files
 %defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/pam.d/system-install-yumpacks
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-install-yumpacks
 %doc AUTHORS ChangeLog ChangeLog.0 COPYING NEWS README TODO
 %{_bindir}/%{name}
-%{_bindir}/%{name}-start
+%{_bindir}/system-install-yumpacks
+%{_sbindir}/system-install-yumpacks
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/fedora-system-install-yumpacks.desktop
+%{_datadir}/icons/hicolor/48x48/apps/installpkg.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_mandir}/man8/%{name}.8.gz
 
@@ -78,6 +91,10 @@
 %{_datadir}/%{name}/ui
 
 %changelog
+* Thu Oct 25 2007 Debarshi Ray <rishi at fedoraproject.org> - 0.0.3-1
+- Added 'Requires: usermode'.
+- Version bump to 0.0.3.
+
 * Thu Aug 23 2007 Debarshi Ray <rishi at fedoraproject.org> - 0.0.2-2
 - Added 'BuildRequires: python'.
 - Fixed build failure caused by check for pirut modules in configure script.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opyum/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Oct 2007 20:08:45 -0000	1.2
+++ sources	26 Oct 2007 21:43:09 -0000	1.3
@@ -1 +1 @@
-299873e5d0b4d762a261edb6b9bc62e6  opyum-0.0.2.tar.gz
+693bc38845aaef5ecf599d7564483f09  opyum-0.0.3.tar.gz


--- opyum DELETED ---


--- opyum-0.0.2-configure.patch DELETED ---




More information about the fedora-extras-commits mailing list