rpms/xscreensaver/F-8 xscreensaver-5.07-webcollage-default-nonet.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xscreensaver.spec, 1.68, 1.69 xscreensaver-5.05-fix-compile.patch, 1.1, NONE xscreensaver-5.05-webcollage-default-nonet.patch, 1.1, NONE xscreensaver-5.06-bz456399-jwz.patch, 1.1, NONE xscreensaver-5.06-bz457685-nvidia-jwz.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-5.07-webcollage-default-nonet.patch 
Removed Files:
	xscreensaver-5.05-fix-compile.patch 
	xscreensaver-5.05-webcollage-default-nonet.patch 
	xscreensaver-5.06-bz456399-jwz.patch 
	xscreensaver-5.06-bz457685-nvidia-jwz.patch 
Log Message:
* Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-1
- Update to 5.07
- Fix the license tag: BSD -> MIT


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

--- NEW FILE xscreensaver-5.07-webcollage-default-nonet.patch ---
--- 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
@@ -28,8 +28,8 @@
   <string id="filter"  _label="Per-image filter program" arg="-filter %"/>
   <string id="filter2" _label="Overall filter program" arg="-filter2 %"/>
   <file id="dictionary" _label="Dictionary file" arg="-dictionary %"/>
-  <file id="dir" _label="Image directory" arg="-directory %"/>
  -->
+  <file id="dir" _label="Image directory" arg="-directory %"/>
 
   <_description>
 This 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Jul 2008 01:59:19 -0000	1.8
+++ .cvsignore	20 Aug 2008 18:13:22 -0000	1.9
@@ -1 +1 @@
-xscreensaver-5.06.tar.gz
+xscreensaver-5.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Jul 2008 01:59:19 -0000	1.8
+++ sources	20 Aug 2008 18:13:22 -0000	1.9
@@ -1 +1 @@
-c6b2cab02aaea32684d37a9a76488e0f  xscreensaver-5.06.tar.gz
+55a12fcb5d3a7231c9850ef9d9f82918  xscreensaver-5.07.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xscreensaver.spec	9 Aug 2008 03:12:41 -0000	1.68
+++ xscreensaver.spec	20 Aug 2008 18:13:22 -0000	1.69
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define mainversion   5.06
+%define mainversion   5.07
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -24,7 +24,7 @@
 Version:         %{mainversion}
 Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
-License:         BSD
+License:         MIT
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz
@@ -32,10 +32,7 @@
 Source10:        update-xscreensaver-hacks
 %endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
-Patch21:         xscreensaver-5.05-webcollage-default-nonet.patch
-# Patch40 is merged into Patch41
-#Patch40:         xscreensaver-5.06-bz456399-jwz.patch
-Patch41:         xscreensaver-5.06-bz457685-nvidia-jwz.patch
+Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -188,11 +185,6 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-# Patch40 is merged into Patch41
-#%%patch40 -p0 -b .jwz40
-cd driver/
-%patch41 -p0 -b .jwz41
-cd ..
 
 change_option(){
    set +x
@@ -615,6 +607,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-1
+- Update to 5.07
+- Fix the license tag: BSD -> MIT
+
 * Sat Aug  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.06-3
 - Fallback to Xinerama extension when Xrandr reports less screens
   than Xinerama


--- xscreensaver-5.05-fix-compile.patch DELETED ---


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


--- xscreensaver-5.06-bz456399-jwz.patch DELETED ---


--- xscreensaver-5.06-bz457685-nvidia-jwz.patch DELETED ---