rpms/xscreensaver/F-8 xscreensaver-5.04-webcollage-default-nonet.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xscreensaver.spec, 1.59, 1.60 xscreensaver-5.02-pidnumber-write_long.patch, 1.1, NONE xscreensaver-5.03-compiler-warning.patch, 1.1, NONE xscreensaver-5.03-demo-conf-maxvalue-plus1.patch, 1.1, NONE xscreensaver-5.03-screen-depth.patch, 1.2, NONE xscreensaver-5.03-webcollage-default-nonet.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1093/F-8

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-5.04-webcollage-default-nonet.patch 
Removed Files:
	xscreensaver-5.02-pidnumber-write_long.patch 
	xscreensaver-5.03-compiler-warning.patch 
	xscreensaver-5.03-demo-conf-maxvalue-plus1.patch 
	xscreensaver-5.03-screen-depth.patch 
	xscreensaver-5.03-webcollage-default-nonet.patch 
Log Message:
* Tue Nov 13 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-1
- Update to 5.04


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

--- NEW FILE xscreensaver-5.04-webcollage-default-nonet.patch ---
--- xscreensaver-5.04/driver/XScreenSaver.ad.in.nonet	2007-11-13 17:36:00.000000000 +0900
+++ xscreensaver-5.04/driver/XScreenSaver.ad.in	2007-11-13 19:09:44.000000000 +0900
@@ -305,10 +305,12 @@
 				cwaves -root				    \n\
 				m6502 -root				    \n\
 				abstractile -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.04/hacks/config/webcollage.xml.nonet	2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.04/hacks/config/webcollage.xml	2007-11-13 19:05:29.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/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Aug 2007 19:18:51 -0000	1.5
+++ .cvsignore	13 Nov 2007 10:49:59 -0000	1.6
@@ -1 +1 @@
-xscreensaver-5.03.tar.gz
+xscreensaver-5.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2007 19:18:51 -0000	1.5
+++ sources	13 Nov 2007 10:49:59 -0000	1.6
@@ -1 +1 @@
-367b0397132102faf43e71e27bbdc181  xscreensaver-5.03.tar.gz
+1d27b5ddecdb49c806d1e91ca82fc43e  xscreensaver-5.04.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xscreensaver.spec	1 Nov 2007 14:16:27 -0000	1.59
+++ xscreensaver.spec	13 Nov 2007 10:49:59 -0000	1.60
@@ -1,13 +1,13 @@
 %define name          xscreensaver
 
-%define version       5.03
+%define version       5.04
 %define beta_ver      %{nil}
 %if 0%{?fedora} <= 6
 %define modular_conf  0
 %define fedora_rel    1.12
 %else
 %define modular_conf  1
-%define fedora_rel    14
+%define fedora_rel    1
 %endif
 
 %define extrarel      %{nil}
@@ -34,13 +34,11 @@
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
+%if %{modular_conf}
 Source10:        update-xscreensaver-hacks
+%endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
-Patch21:         xscreensaver-5.03-webcollage-default-nonet.patch
-Patch40:         xscreensaver-5.02-pidnumber-write_long.patch
-Patch41:         xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
-Patch42:         xscreensaver-5.03-compiler-warning.patch
-Patch43:         xscreensaver-5.03-screen-depth.patch
+Patch21:         xscreensaver-5.04-webcollage-default-nonet.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -187,10 +185,6 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch40 -p1 -b .pidnum_debug
-%patch41 -p1 -b .conf_max
-%patch42 -p1 -b .warn
-%patch43 -p1 -b .screen_depth
 
 change_option(){
    set +x
@@ -572,6 +566,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 13 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-1
+- Update to 5.04
+
 * Thu Nov  1 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-14
 - Patch from upstream to fix screen depth problem (also "really"
   fix bug 336331).


--- xscreensaver-5.02-pidnumber-write_long.patch DELETED ---


--- xscreensaver-5.03-compiler-warning.patch DELETED ---


--- xscreensaver-5.03-demo-conf-maxvalue-plus1.patch DELETED ---


--- xscreensaver-5.03-screen-depth.patch DELETED ---


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