rpms/xscreensaver/devel xscreensaver-5.03-webcollage-default-nonet.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xscreensaver.spec, 1.42, 1.43 xscreensaver-5.01-webcollage-default-nonet.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357/devel

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-5.03-webcollage-default-nonet.patch 
Removed Files:
	xscreensaver-5.01-webcollage-default-nonet.patch 
Log Message:
* Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
- Update to 5.03


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

--- NEW FILE xscreensaver-5.03-webcollage-default-nonet.patch ---
--- xscreensaver-5.03/driver/XScreenSaver.ad.in.nonet	2007-07-17 18:01:47.000000000 +0900
+++ xscreensaver-5.03/driver/XScreenSaver.ad.in	2007-08-29 01:39:14.000000000 +0900
@@ -304,10 +304,12 @@
 				celtic -root				    \n\
 				cwaves -root				    \n\
 				m6502 -root				    \n\
-- default-n:			webcollage -root			    \n\
+- default-n:			webcollage -root			      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:  "WebCollage (whacked)"					      \
 				webcollage -root -filter		      \
-				  'vidwhacker -stdin -stdout'		    \n\
+				  'vidwhacker -stdin -stdout'		      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:			vidwhacker -root			    \n\
 									      \
 @GL_KLUDGE@ GL:			gears -root				    \n\
--- xscreensaver-5.03/hacks/config/webcollage.xml.nonet	2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.03/hacks/config/webcollage.xml	2007-08-29 01:33:52.000000000 +0900
@@ -20,7 +20,7 @@
 
   <string id="filter2" _label="Overall Filter Program" arg="-filter2 %"/>
 
-<!-- <file id="dictionary" _label="Dictionary File" arg="-dictionary %"/> -->
+  <file id="directory" _label="Image search directory" arg="-directory %"/>
 
   <_description>
 This program makes collages out of random images pulled off of the


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Apr 2007 09:35:36 -0000	1.4
+++ .cvsignore	28 Aug 2007 19:18:51 -0000	1.5
@@ -1 +1 @@
-xscreensaver-5.02.tar.gz
+xscreensaver-5.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Apr 2007 09:35:36 -0000	1.4
+++ sources	28 Aug 2007 19:18:51 -0000	1.5
@@ -1 +1 @@
-83937791b30f55f52011d4fee0f5dff3  xscreensaver-5.02.tar.gz
+367b0397132102faf43e71e27bbdc181  xscreensaver-5.03.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xscreensaver.spec	28 Aug 2007 08:03:52 -0000	1.42
+++ xscreensaver.spec	28 Aug 2007 19:18:51 -0000	1.43
@@ -1,8 +1,8 @@
 %define name          xscreensaver
 
-%define version       5.02
+%define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    4
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -29,7 +29,7 @@
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
-Patch21:         xscreensaver-5.01-webcollage-default-nonet.patch
+Patch21:         xscreensaver-5.03-webcollage-default-nonet.patch
 Patch40:         xscreensaver-5.02-pidnumber-write_long.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -194,6 +194,7 @@
 
 # change some options
 change_option driver/XScreenSaver.ad.in \
+   captureStderr=False \
    passwdTimeout=0:00:15 \
    grabDesktopImages=False \
    lock=True \
@@ -432,6 +433,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
+- Update to 5.03
+
 * Tue Aug 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-4
 - Spec file cleanup
   - Don't use include-directory patch anymore


--- xscreensaver-5.01-webcollage-default-nonet.patch DELETED ---