rpms/synaptic/devel synaptic.spec,1.27,1.28

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/synaptic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20994

Modified Files:
	synaptic.spec 
Log Message:
- fix desktop categories
- fix pam_stack autodetection



Index: synaptic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- synaptic.spec	8 Jul 2007 20:33:32 -0000	1.27
+++ synaptic.spec	10 Jul 2007 07:15:51 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: GPL
 Group: Applications/System
@@ -72,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
 
@@ -85,8 +84,10 @@
 desktop-file-install --vendor fedora 		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode=0644					\
+  --remove-key MultipleArgs			\
+  --remove-category Application			\
   --add-category X-Fedora			\
-  --add-category SystemSetup                    \
+  --add-category Settings			\
   data/%{name}.desktop
 
 %clean
@@ -113,6 +114,10 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* 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