rpms/synaptic/F-7 synaptic.spec,1.26,1.27

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/synaptic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4651/F-7

Modified Files:
	synaptic.spec 
Log Message:
Backport to F7.


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/F-7/synaptic.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- synaptic.spec	5 Jun 2007 23:29:25 -0000	1.26
+++ synaptic.spec	30 Dec 2007 12:39:09 -0000	1.27
@@ -3,9 +3,9 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 10%{?dist}
+Release: 14%{?dist}
 
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz
 Patch0: synaptic-0.57-desktop.patch
@@ -15,12 +15,13 @@
 Patch2: http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch
 Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch
 Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch
+Patch5: http://apt-rpm.org/patches/synaptic-0.57.2-progressapi-hack.patch
 URL: http://www.nongnu.org/synaptic/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: usermode-gtk
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
-BuildRequires: apt-devel >= 0.5.15lorg3.1, rpm-devel >= 4.0
+BuildRequires: apt-devel >= 0.5.15lorg3.92, rpm-devel >= 4.0
 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils
 BuildRequires: libstdc++-devel, gettext
 BuildRequires: xmlto, perl-XML-Parser
@@ -38,6 +39,7 @@
 %patch2 -p1 -b .gcc41
 %patch3 -p1 -b .repomd
 %patch4 -p1 -b .showprog
+%patch5 -p1 -b .progresshack
 
 %build
 %configure --disable-dependency-tracking
@@ -70,9 +72,8 @@
 session    optional     /%{_lib}/security/pam_timestamp.so
 account    required     /%{_lib}/security/pam_permit.so
 EOF
-if -f /%{_lib}/security/pam_stack.so \
-   -a ! grep "Deprecated pam_stack module" /%{_lib}/security/pam_stack.so \
-      2>&1 > /dev/null; then
+if [ -f /%{_lib}/security/pam_stack.so ] && \
+   ! grep -q "Deprecated pam_stack module" /%{_lib}/security/pam_stack.so; then
   perl -pi -e's,include(\s*)(.*),required\1pam_stack.so service=\2,' $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/synaptic
 fi
 
@@ -83,8 +84,8 @@
 desktop-file-install --vendor fedora 		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode=0644					\
-  --add-category X-Fedora			\
-  --add-category SystemSetup                    \
+  --remove-key MultipleArgs			\
+  --remove-category Application			\
   data/%{name}.desktop
 
 %clean
@@ -111,6 +112,24 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Mon Nov 26 2007 Panu Matilainen <pmatilai at redhat.com> - 0.57.2-14
+- remove unnecessary extra desktop categories (#283921)
+- rebuild (#389371)
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.57.2-13
+- Rebuild for selinux ppc32 issue.
+
+* Fri Aug 03 2007 Panu Matilainen <pmatilai at redhat.com> 
+- License clarification
+
+* Tue Jul 10 2007 Panu Matilainen <pmatilai at redhat.com> - 0.57.2-12
+- fix desktop categories
+- fix pam_stack autodetection 
+
+* Sun Jul 08 2007 Panu Matilainen <pmatilai at redhat.com> - 0.57.2-11
+- add an ugly kludge to make it work with new apt-rpm progress api
+- update buildreq apt version for the above
+
 * Sun Jun  3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.57.2-10
 - Autodetect pam_stack module at build time.