rpms/xscreensaver/devel xscreensaver-4.22-change-defaults.patch, NONE, 1.1 xscreensaver-4.22-make-hack-paths-absolute.patch, 1.1, 1.2 xscreensaver.spec, 1.62, 1.63 xscreensaver-4.21-change-defaults.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Sep 9 18:33:45 UTC 2005


Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28285

Modified Files:
	xscreensaver-4.22-make-hack-paths-absolute.patch 
	xscreensaver.spec 
Added Files:
	xscreensaver-4.22-change-defaults.patch 
Removed Files:
	xscreensaver-4.21-change-defaults.patch 
Log Message:
- take BSOD out of the default random list (bug 105388).


xscreensaver-4.22-change-defaults.patch:
 XScreenSaver.ad.in |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

--- NEW FILE xscreensaver-4.22-change-defaults.patch ---
--- xscreensaver-4.22/driver/XScreenSaver.ad.in.change-defaults	2005-06-22 20:56:50.000000000 -0400
+++ xscreensaver-4.22/driver/XScreenSaver.ad.in	2005-09-09 14:30:00.000000000 -0400
@@ -37,25 +37,25 @@
 *dpmsStandby:		2:00:00
 *dpmsSuspend:		2:00:00
 *dpmsOff:		4:00:00
-*grabDesktopImages:	True
+*grabDesktopImages:	False
 *grabVideoFrames:	False
 *chooseRandomImages:	@DEFAULT_IMAGES_P@
 *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
 *nice:			10
 *memoryLimit:		0
-*lock:			False
-*lockVTs:		True
+*lock:			True
+*lockVTs:		False
 *verbose:		False
 *timestamp:		True
 *fade:			True
 *unfade:		False
 *fadeSeconds:		0:00:03
 *fadeTicks:		20
-*splash:		True
+*splash:		False
 *splashDuration:	0:00:05
 *visualID:		default
-*captureStderr: 	True
-*ignoreUninstalledPrograms: False
+*captureStderr: 	False
+*ignoreUninstalledPrograms: True
 
 *textMode:		file
 *textLiteral:		XScreenSaver
@@ -75,7 +75,7 @@
 
 ! Set this to True if you are experiencing longstanding XFree86 bug #421
 ! (xscreensaver not covering the whole screen)
-GetViewPortIsFullOfLies: False
+GetViewPortIsFullOfLies: True
 
 ! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.)
 *demoCommand: xscreensaver-demo
@@ -94,13 +94,11 @@
 !
 !   Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
 !
- at GNOME24@*loadURL: gnome-open '%s'
 @GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
 @GNOME24@		--command '/bin/sh -c "man %s; read foo"'
 !
 !   Gnome 2.2:
 !
- at GNOME22@*loadURL: gnome-url-show '%s'
 @GNOME22@*manualCommand: gnome-terminal --title '%s manual' \
 @GNOME22@		--command '/bin/sh -c "man %s; read foo"'
 !
@@ -111,10 +109,10 @@
 !
 !   non-Gnome systems:
 !
- at NOGNOME@*loadURL: firefox '%s' || mozilla '%s' || netscape '%s'
 @NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
 @NOGNOME@		    -e /bin/sh -c 'man "%s" ; read foo'
 
+loadURL: htmlview '%s'
 
 ! The format used for printing the date and time in the password dialog box
 ! (see the strftime(3) manual page for details.)
@@ -238,7 +236,7 @@
 				epicycle -root				    \n\
 				interference -root			    \n\
 				truchet -root -randomize		    \n\
-				bsod -root				    \n\
+-				bsod -root				    \n\
 				crystal -root				    \n\
 				discrete -root				    \n\
 				kumppa -root				    \n\
@@ -467,7 +465,7 @@
 *Dialog.borderWidth:		1
 *Dialog.shadowThickness:	2
 
-*passwd.heading.label:		XScreenSaver %s
+*passwd.heading.label:		Screen Locked
 *passwd.body.label:		Please enter your password.
 *passwd.login.label:		New Login
 *passwd.user.label:		Username:

xscreensaver-4.22-make-hack-paths-absolute.patch:
 XScreenSaver.ad.in |  432 +++++++++++++++++++++++++++++------------------------
 1 files changed, 239 insertions(+), 193 deletions(-)

Index: xscreensaver-4.22-make-hack-paths-absolute.patch
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver-4.22-make-hack-paths-absolute.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-4.22-make-hack-paths-absolute.patch	3 Aug 2005 21:15:59 -0000	1.1
+++ xscreensaver-4.22-make-hack-paths-absolute.patch	9 Sep 2005 18:33:39 -0000	1.2
@@ -150,7 +150,7 @@
 -				epicycle -root				    \n\
 -				interference -root			    \n\
 -				truchet -root -randomize		    \n\
--				bsod -root				    \n\
+--				bsod -root				    \n\
 -				crystal -root				    \n\
 -				discrete -root				    \n\
 -				kumppa -root				    \n\


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xscreensaver.spec	8 Sep 2005 18:23:37 -0000	1.62
+++ xscreensaver.spec	9 Sep 2005 18:33:39 -0000	1.63
@@ -4,14 +4,14 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release:	14
+Release:	15
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
 URL:		http://www.jwz.org/xscreensaver/
 Source0:	xscreensaver-%{version}.tar.gz
 Source1:	removed-display-modes
-Patch0:		xscreensaver-4.21-change-defaults.patch
+Patch0:		xscreensaver-4.22-change-defaults.patch
 Patch1:		xscreensaver-4.16-sanitize-hacks.patch
 Patch2:         xscreensaver-4.21-dont-ping-if-not-root.patch
 Patch3:		xscreensaver-4.22-make-hack-paths-absolute.patch
@@ -216,6 +216,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Sep  9 2005 Ray Strode <rstrode at redhat.com> 1:4.22-15
+- take BSOD out of the default random list (bug 105388).
+
 * Thu Sep 08 2005 Florian La Roche <laroche at redhat.com>
 - add version-release to the Provides:
 


--- xscreensaver-4.21-change-defaults.patch DELETED ---




More information about the fedora-cvs-commits mailing list