rpms/xawtv/FC-6 xawtv.spec,1.1,1.2

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/xawtv/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11339

Modified Files:
	xawtv.spec 
Log Message:



Index: xawtv.spec
===================================================================
RCS file: /cvs/extras/rpms/xawtv/FC-6/xawtv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xawtv.spec	25 Jun 2007 13:46:04 -0000	1.1
+++ xawtv.spec	24 Jul 2007 12:49:03 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
 Version: 3.95
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://bytesex.org/xawtv/
@@ -85,7 +85,6 @@
 
 desktop-file-install --vendor fedora		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-  --add-category X-Fedora			\
   %{SOURCE1}
  
 
@@ -97,9 +96,11 @@
 
 cat >v4l-conf.pam <<!
 #%PAM-1.0
-auth		include		config-util
-account		include		config-util
-session		include		config-util
+auth		sufficient	pam_rootok.so
+auth		required	pam_console.so
+account		required	pam_permit.so
+session		required	pam_permit.so
+session		optional	pam_xauth.so
 !
 install -m 0644 v4l-conf.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/v4l-conf
 
@@ -136,6 +137,12 @@
 
 
 %changelog
+* Tue Jul 24 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.95-4
+- don't assume v4l-conf as system config util (#249130)
+
+* Tue Jun 26 2007 Dmitry Butskoy <Dmitry at Butskoy.name>
+- drop X-Fedora category from desktop file
+
 * Mon Jun 25 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.95-3
 - add patch for use getpagesize() instead of a kernel headers macro