rpms/xscreensaver/devel xscreensaver-5.00-xmlfix.patch, NONE, 1.1 xscreensaver.spec, 1.8, 1.9

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.00-xmlfix.patch 
Log Message:
* Thu Jun  1 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-5
- Disable (not remove) some hacks by default according to 4.24 behavior.
- XML file fix for slidescreen.


xscreensaver-5.00-xmlfix.patch:

--- NEW FILE xscreensaver-5.00-xmlfix.patch ---
--- xscreensaver-5.00/hacks/config/slidescreen.xml.xmlfix	2006-04-29 10:28:46.000000000 +0900
+++ xscreensaver-5.00/hacks/config/slidescreen.xml	2006-06-01 16:15:31.000000000 +0900
@@ -11,7 +11,7 @@
 
  <number id="delay2" type="slider" arg="-delay2 %"
          _label="Pause" _low-label="Short" _high-label="Long"
-         low="0" high="1000000" default="2000000"/>
+         low="0" high="2000000" default="1000000"/>
 
   <number id="increment" type="slider" arg="-increment %"
           _label="Slide Speed" _low-label="Slow" _high-label="Fast"


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xscreensaver.spec	1 Jun 2006 04:23:09 -0000	1.8
+++ xscreensaver.spec	2 Jun 2006 12:15:35 -0000	1.9
@@ -1,7 +1,7 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	4.2
+%define fedora_rel	5
 
 %define fedora_ver	5.89
 %define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
@@ -23,6 +23,7 @@
 Patch8:		xscreensaver-5.00b5-include-directory.patch
 Patch101:	xscreensaver-5.00-localefix-restrict.patch
 Patch102:	xscreensaver-5.00-matherr-utils.patch
+Patch104:	xscreensaver-5.00-xmlfix.patch
 
 # find_lang
 BuildRequires:	gettext
@@ -94,8 +95,9 @@
 %patch8 -p1 -b .include-dir
 %patch101 -p1 -b .locale-fix-restrict
 %patch102 -p1 -b .matherr2
+%patch104 -p1 -b .xmlfix
 
-fix_adfile(){
+change_option(){
    ADFILE=$1
    shift
 
@@ -111,11 +113,26 @@
    done
 }
 
-fix_adfile driver/XScreenSaver.ad.in \
+silence_hack(){
+    ADFILE=$1
+    shift
+
+    for hack in $* ; do
+	eval sed -i \
+	    -e \'\/\^\[ \\t\]\[ \\t\]\*$hack\/s\|\^\|-\|g\' \
+	    -e \'s\|\^@GL_\.\*@.*\\\(GL\:\[ \\t\]\[ \\t\]\*$hack\\\)\|-\\t\\1\|g\' \
+	    $ADFILE
+    done
+}
+
+change_option driver/XScreenSaver.ad.in \
 	grabDesktopImages=False lock=True \
 	splash=False ignoreUninstalledPrograms=True \
 	passwd.heading.label=Screen\ Locked
 
+silence_hack driver/XScreenSaver.ad.in \
+	bsod flag
+
 sed -i -e 's|version [45].[0-9a-z][0-9a-z]*|version %{version}|' \
    driver/XScreenSaver.ad.in
 
@@ -253,9 +270,13 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Jun  1 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-5
+- Disable (not remove) some hacks by default according to 4.24 behavior.
+- XML file fix for slidescreen.
+
 * Thu Jun  1 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-4
 - Rewrite the patch for decimal separator as discussed with jwz.
-- Change default not by patch but by function.
+- Change defaults not by patch but by function.
 
 * Wed May 31 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-3
 - Fix browser option patch.