rpms/xscreensaver/F-8 xscreensaver-5.07-webcollage-default-nonet.patch, 1.1, 1.2

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2665/F-8

Modified Files:
	xscreensaver-5.07-webcollage-default-nonet.patch 
Log Message:
Forgot to commit patch...

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

Index: xscreensaver-5.07-webcollage-default-nonet.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/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:13:22 -0000	1.1
+++ xscreensaver-5.07-webcollage-default-nonet.patch	25 Nov 2008 15:07:25 -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