rpms/xscreensaver/devel xscreensaver-5.03-demo-conf-maxvalue-plus1.patch, NONE, 1.1 xscreensaver.spec, 1.54, 1.55

Mamoru Tasaka (mtasaka) fedora-extras-commits at redhat.com
Sat Oct 6 14:10:40 UTC 2007


Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.03-demo-conf-maxvalue-plus1.patch 
Log Message:
* Sat Oct  6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-10
- Fix the maximum value on demo configuration dialog
- Change the encoding of XScreenSaver.ad and man files


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

--- NEW FILE xscreensaver-5.03-demo-conf-maxvalue-plus1.patch ---
--- xscreensaver-5.03/driver/demo-Gtk-conf.c.debug	2006-05-24 07:02:11.000000000 +0900
+++ xscreensaver-5.03/driver/demo-Gtk-conf.c	2007-10-06 22:36:55.000000000 +0900
@@ -749,6 +749,7 @@
                  : p->value);
   gfloat si = (p->high - p->low) / 100;
   gfloat pi = (p->high - p->low) / 10;
+  gfloat page_size = ((p->type == SLIDER) ? 1 : 0);
 
   if (p->value < p->low || p->value > p->high)
     {
@@ -786,8 +787,8 @@
 
   return GTK_ADJUSTMENT (gtk_adjustment_new (value,
                                              p->low,
-                                             p->high + 1,
-                                             si, pi, 1));
+                                             p->high + page_size,
+                                             si, pi, page_size));
 }
 
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xscreensaver.spec	2 Oct 2007 14:03:10 -0000	1.54
+++ xscreensaver.spec	6 Oct 2007 14:10:08 -0000	1.55
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    9
+%define fedora_rel    10
 %endif
 
 %define extrarel      %{nil}
@@ -38,6 +38,7 @@
 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
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -169,6 +170,7 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch40 -p1 -b .pidnum_debug
+%patch41 -p1 -b .conf_max
 
 change_option(){
    set +x
@@ -206,6 +208,16 @@
    set -x
 }
 
+# change some files to UTF-8
+for f in \
+   driver/XScreenSaver.ad.in \
+   hacks/glx/sproingies.man \
+   ; do
+   iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp || cp -p $f $f.tmp
+   touch -r $f $f.tmp
+   mv $f.tmp $f
+done
+
 # change some options
 change_option driver/XScreenSaver.ad.in \
    captureStderr=False \
@@ -517,6 +529,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Oct  6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-10
+- Fix the maximum value on demo configuration dialog
+- Change the encoding of XScreenSaver.ad and man files
+
 * Tue Oct  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-9
 - Change the default browser to xdg-open
 - Don't mark XScreenSaver.ad as %%config. This file is overwritten




More information about the fedora-extras-commits mailing list