rpms/xscreensaver/devel xscreensaver-5.07-webcollage-default-nonet.patch, 1.1, 1.2 xscreensaver.spec, 1.75, 1.76

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv464

Modified Files:
	xscreensaver-5.07-webcollage-default-nonet.patch 
	xscreensaver.spec 
Log Message:
* Wed Nov 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-3
- Create wrapper script for webcollage to use nonet option
  by default, and rename the original webcollage (bug 472061)


xscreensaver-5.07-webcollage-default-nonet.patch:

Index: xscreensaver-5.07-webcollage-default-nonet.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.07-webcollage-default-nonet.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-5.07-webcollage-default-nonet.patch	20 Aug 2008 18:08:54 -0000	1.1
+++ xscreensaver-5.07-webcollage-default-nonet.patch	19 Nov 2008 08:35:50 -0000	1.2
@@ -1,17 +1,5 @@
---- xscreensaver-5.07/driver/XScreenSaver.ad.in.nonet	2008-08-11 13:50:05.000000000 +0900
-+++ xscreensaver-5.07/driver/XScreenSaver.ad.in	2008-08-21 01:41:53.000000000 +0900
-@@ -252,7 +252,8 @@
- 				squiral -root				    \n\
- 				t3d -root				    \n\
- 				wander -root				    \n\
---				webcollage -root			    \n\
-+-				webcollage -root			    \
-+					-directory @DEFAULT_IMAGE_DIRECTORY@	\n\
- 				xflame -root				    \n\
- 				xmatrix -root				    \n\
- @GL_KLUDGE@ GL: 				gflux -root				    \n\
 --- xscreensaver-5.07/hacks/config/webcollage.xml.nonet	2008-08-04 04:23:41.000000000 +0900
-+++ xscreensaver-5.07/hacks/config/webcollage.xml	2008-08-21 01:40:33.000000000 +0900
++++ xscreensaver-5.07/hacks/config/webcollage.xml	2008-11-19 16:54:33.000000000 +0900
 @@ -28,8 +28,8 @@
    <string id="filter"  _label="Per-image filter program" arg="-filter %"/>
    <string id="filter2" _label="Overall filter program" arg="-filter2 %"/>
@@ -22,3 +10,29 @@
  
    <_description>
  This makes collages out of random images pulled off of the
+@@ -44,6 +44,11 @@
+ 
+ See also http://www.jwz.org/webcollage/
+ 
++NOTE:
++Webcollage on Fedora does not connect to internet by default
++and uses image files on your local disk. If you want webcollage to
++search for image files on net, use webcollage.original .
++
+ Written by Jamie Zawinski; 1999.
+   </_description>
+ </screensaver>
+--- xscreensaver-5.07/hacks/webcollage.man.nonet	2008-08-01 05:00:23.000000000 +0900
++++ xscreensaver-5.07/hacks/webcollage.man	2008-11-19 16:47:04.000000000 +0900
+@@ -173,6 +173,11 @@
+ .TP 8
+ .B \-fps
+ Display the current frame rate and CPU load.
++.SH NOTES FOR FEDORA USER
++Webcollage on Fedora uses '-directory' option by default, so it
++.B does not connect to internet 
++and uses image files on your local disk. If you want webcollage to
++search for image files on net, use webcollage.original .
+ .SH ENVIRONMENT
+ .PP
+ .TP 8


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xscreensaver.spec	11 Sep 2008 16:22:19 -0000	1.75
+++ xscreensaver.spec	19 Nov 2008 08:35:50 -0000	1.76
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -523,9 +523,12 @@
    COMMENT=`echo $COMMENT`
 
 # webcollage treatment
+## changed to create wrapper script
+%if 0
    if [ "x$COMMAND" = "xwebcollage" ] ; then
       ARG="$ARG -directory %{_datadir}/backgrounds/images"
    fi
+%endif
 
    if [ "x$NAME" = "x" ] ; then NAME=$COMMAND ; fi
 
@@ -569,6 +572,23 @@
    set -x
 done
 
+# Create wrapper script for webcollage to use nonet option
+# by default, and rename the original webcollage
+# (see bug 472061)
+pushd ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
+mv -f webcollage webcollage.original
+
+cat > webcollage <<EOF
+#!/bin/sh
+PATH=%{_libexecdir}/%{name}:\$PATH
+exec webcollage.original \\
+	-directory %{_datadir}/backgrounds/images \\
+	"\$@"
+EOF
+chmod 0755 webcollage
+echo "%%{_libexecdir}/%%{name}/webcollage.original" >> \
+	$dd/extras.files
+
 # Make sure all files are readable by all, and writable only by owner.
 #
 chmod -R a+r,u+w,og-w ${RPM_BUILD_ROOT}
@@ -611,6 +631,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Nov 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-3
+- Create wrapper script for webcollage to use nonet option
+  by default, and rename the original webcollage (bug 472061)
+
 * Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
 - Update ja.po
 - Fix the explanation in XScreenSaver.ad (bug 461415)