rpms/xscreensaver/devel xscreensaver.spec,1.68,1.69

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12150

Modified Files:
	xscreensaver.spec 
Log Message:
- Update list_files function to fix ownership issues.
  Patch from Mamoru Tasaka (mtasaka at ioa.s.u-tokyo.ac.jp) (bug 161728).



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xscreensaver.spec	1 Nov 2005 19:54:31 -0000	1.68
+++ xscreensaver.spec	5 Dec 2005 15:36:13 -0000	1.69
@@ -4,7 +4,7 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release:	20
+Release:	21
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -149,13 +149,18 @@
 # It does this by parsing the output of a dummy run of "make install".
 #
 list_files() {
+  echo "%%defattr(-,root,root)"
   make -s install_prefix=${RPM_BUILD_ROOT} INSTALL=true "$@"	\
+   | sed -e 's at .*directory.* \(/[^ ]*\)$@ \1DIR@'               \
+   | sed -e 's at .*-m 4755.* \([^ ]*\)$@ \1SETUID@'               \
    | sed -n -e 's at .* \(/[^ ]*\)$@\1 at p'				\
-   | sed    -e "s@^${RPM_BUILD_ROOT}@@"				\
-	    -e "s@/[a-z][a-z]*/\.\./@/@"			\
-   | sed    -e 's@\(.*/man/.*\)@\1\*@'				\
-   | sed    -e 's@\(.*/app-defaults/\)@%config \1@'		\
-	    -e 's@\(.*/pam\.d/\)@%config(missingok) \1@'	\
+   | sed    -e "s@^${RPM_BUILD_ROOT}@@" 			\
+            -e "s@/[a-z][a-z]*/\.\./@/@"			\
+   | sed    -e '/DIR$/!s@\(.*/man/.*\)@\1\*@'			\
+   | sed    -e '/DIR$/!s@\(.*/app-defaults/\)@%config \1@'      \
+            -e '/DIR$/!s@\(.*/pam\.d/\)@%config(missingok) \1@' \
+   | sed    -e 's@\(.*\)DIR$@%dir \1@'                          \
+   | sed    -e 's@\(.*\)SETUID$@%attr(4755,root,root) \1@'      \
    | sort
 }
 
@@ -224,6 +229,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Dec  5 2005 Ray Strode <rstrode at redhat.com> 1:4.22-21
+- Update list_files function to fix ownership issues.
+  Patch from Mamoru Tasaka (mtasaka at ioa.s.u-tokyo.ac.jp) (bug 161728).
+
 * Tue Nov  1 2005 Ray Strode <rstrode at redhat.com> 1:4.22-20
 - Switch requires to modular X