packages: xscreensaver/xscreensaver.spec - perl-perldoc optional (note who ...

[glen]

Author: glen                         Date: Sat Mar  5 10:47:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- perl-perldoc optional (note who uses)
- optional appres dep for xscreensaver-text
- optional base req for starwars requiring xscreensaver-text
- comsmetics

---- Files affected:
packages/xscreensaver:
   xscreensaver.spec (1.165 -> 1.166) 

---- Diffs:

================================================================
Index: packages/xscreensaver/xscreensaver.spec
diff -u packages/xscreensaver/xscreensaver.spec:1.165 packages/xscreensaver/xscreensaver.spec:1.166
--- packages/xscreensaver/xscreensaver.spec:1.165	Sat Jan 29 01:08:11 2011
+++ packages/xscreensaver/xscreensaver.spec	Sat Mar  5 11:47:28 2011
@@ -13,7 +13,7 @@
 Summary(zh_CN.UTF-8):	X 窗口系统保护器
 Name:		xscreensaver
 Version:	5.10
-Release:	2
+Release:	3
 Epoch:		1
 License:	BSD
 Group:		X11/Applications
@@ -45,8 +45,11 @@
 BuildRequires:	pkgconfig
 Requires:	%{name}-savers = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.77.3
-Requires:	perl-perldoc
 Requires:	xorg-lib-libXt >= 1.0.0
+# for screensaver-getimage-file
+Suggests:	perl-perldoc
+# for xscreensaver-text
+Suggests:	xorg-app-appres
 Obsoletes:	xscreensaver-gnome
 Obsoletes:	xscreensaver-gnome1
 Obsoletes:	xscreensaver-gnome2
@@ -128,6 +131,8 @@
 Group:		X11/Applications
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	%{name}-savers = %{epoch}:%{version}-%{release}
+# for starwars req: xscreensaver-text
+Suggests:	%{name}
 
 %description GL
 Screen savers which uses OpenGL libraries.
@@ -210,7 +215,7 @@
 
 %{__make} -C driver install-pam \
 	PAM_DIR=$RPM_BUILD_ROOT/etc/pam.d
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/xscreensaver
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/xscreensaver
 
 _DIR=$(pwd)
 cd $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -235,20 +240,20 @@
 	fi
 }
 
-for file in * ; do
-	_REQUIRES="`objdump -p $file 2> /dev/null | awk '
+for file in *; do
+	_REQUIRES=$(objdump -p $file 2> /dev/null | awk '
 		BEGIN { START=0; LIBNAME=""; }
 		/Dynamic Section:/ { START=1; }
 		/NEEDED/ && (START==1) {
 			LIBNAME=$2;
 		}
 		(START==1) && (LIBNAME!="") { print LIBNAME; }
-		/^$/ { START=0; }' 2>&1 `"
+		/^$/ { START=0; }')
 
-	if (echo "$_REQUIRES" | grep -q "libgle.so"); then
+	if echo "$_REQUIRES" | grep -q "libgle.so"; then
 		echo "%attr(755,root,root) %{_libdir}/xscreensaver/$file" >> $_DIR/files.gle
 		find_config_and_man $file >> $_DIR/files.gle
-	elif (echo "$_REQUIRES" | grep -q "libGLU.so"); then
+	elif echo "$_REQUIRES" | grep -q "libGLU.so"; then
 		echo "%attr(755,root,root) %{_libdir}/xscreensaver/$file" >> $_DIR/files.gl
 		find_config_and_man $file >> $_DIR/files.gl
 	else
@@ -323,6 +328,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.166  2011/03/05 10:47:28  glen
+- perl-perldoc optional (note who uses)
+- optional appres dep for xscreensaver-text
+- optional base req for starwars requiring xscreensaver-text
+- comsmetics
+
 Revision 1.165  2011/01/29 00:08:11  sparky
 - dropped pre-cvs changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xscreensaver/xscreensaver.spec?r1=1.165&r2=1.166&f=u