From e926fffaedcaac5aca2b239432d8fad4eda194ee Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Oct 27 2010 22:11:23 +0000
Subject: - Remove GTK warning about non-zero page-size on GtkSpinButton


---

diff --git a/xscreensaver-5.12-gtkspinbox-page-size-to-zero.patch b/xscreensaver-5.12-gtkspinbox-page-size-to-zero.patch
new file mode 100644
index 0000000..fa9ffc4
--- /dev/null
+++ b/xscreensaver-5.12-gtkspinbox-page-size-to-zero.patch
@@ -0,0 +1,65 @@
+--- xscreensaver-5.12/driver/xscreensaver-demo.glade2.debug	2010-09-15 17:45:52.000000000 +0900
++++ xscreensaver-5.12/driver/xscreensaver-demo.glade2	2010-10-28 06:16:07.000000000 +0900
+@@ -253,7 +253,7 @@
+ 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 			  <property name="snap_to_ticks">True</property>
+ 			  <property name="wrap">False</property>
+-			  <property name="adjustment">1 1 720 1 15 15</property>
++			  <property name="adjustment">1 1 720 1 15 0</property>
+ 			  <accessibility>
+ 			    <atkrelation target="timeout_label" type="labelled-by"/>
+ 			    <atkrelation target="timeout_mlabel" type="labelled-by"/>
+@@ -285,7 +285,7 @@
+ 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 			  <property name="snap_to_ticks">True</property>
+ 			  <property name="wrap">False</property>
+-			  <property name="adjustment">0 0 720 1 15 15</property>
++			  <property name="adjustment">0 0 720 1 15 0</property>
+ 			  <accessibility>
+ 			    <atkproperty name="AtkObject::accessible_name" translatable="yes">Lock Screen After</atkproperty>
+ 			    <atkrelation target="lock_button" type="controlled-by"/>
+@@ -320,7 +320,7 @@
+ 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 			  <property name="snap_to_ticks">True</property>
+ 			  <property name="wrap">False</property>
+-			  <property name="adjustment">0 0 720 1 15 15</property>
++			  <property name="adjustment">0 0 720 1 15 0</property>
+ 			  <accessibility>
+ 			    <atkrelation target="cycle_label" type="labelled-by"/>
+ 			    <atkrelation target="cycle_mlabel" type="labelled-by"/>
+@@ -1944,7 +1944,7 @@
+ 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 				      <property name="snap_to_ticks">True</property>
+ 				      <property name="wrap">False</property>
+-				      <property name="adjustment">0 0 1440 1 15 15</property>
++				      <property name="adjustment">0 0 1440 1 15 0</property>
+ 				      <accessibility>
+ 					<atkrelation target="dpms_button" type="controlled-by"/>
+ 					<atkrelation target="dpms_off_label" type="labelled-by"/>
+@@ -1977,7 +1977,7 @@
+ 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 				      <property name="snap_to_ticks">True</property>
+ 				      <property name="wrap">False</property>
+-				      <property name="adjustment">0 0 1440 1 15 15</property>
++				      <property name="adjustment">0 0 1440 1 15 0</property>
+ 				      <accessibility>
+ 					<atkrelation target="dpms_button" type="controlled-by"/>
+ 					<atkrelation target="dpms_suspend_label" type="labelled-by"/>
+@@ -2010,7 +2010,7 @@
+ 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 				      <property name="snap_to_ticks">True</property>
+ 				      <property name="wrap">False</property>
+-				      <property name="adjustment">0 0 1440 1 15 15</property>
++				      <property name="adjustment">0 0 1440 1 15 0</property>
+ 				      <accessibility>
+ 					<atkrelation target="dpms_button" type="controlled-by"/>
+ 					<atkrelation target="dpms_standby_label" type="labelled-by"/>
+@@ -2243,7 +2243,7 @@
+ 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 				      <property name="snap_to_ticks">True</property>
+ 				      <property name="wrap">False</property>
+-				      <property name="adjustment">0 0 10 1 1 1</property>
++				      <property name="adjustment">0 0 10 1 1 0</property>
+ 				      <accessibility>
+ 					<atkrelation target="unfade_button" type="controlled-by"/>
+ 					<atkrelation target="fade_button" type="controlled-by"/>
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 6b4f94c..0e01c66 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    5
+%define fedora_rel    6
 
 %undefine extrarel
 
@@ -59,13 +59,17 @@ Patch30:         xscreensaver-5.11-conf264.patch
 # on passwd prompt
 Patch31:         xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
 #
+# Patch32, 33, 34, 35: already sent to the upstream
+#
 # Kill memleak on gltext (bug 638600)
 Patch32:         xscreensaver-5.12-gltext-memleak.patch
 # Remove duplicate xml files entry
 Patch33:         xscreensaver-5.12-xml-duplicate-list.patch
 # Fix the issue that flame is completely blank (bug 642651)
 Patch34:         xscreensaver-5.12-flame-completely-blank.patch
-#
+# Remove Gtk-warning
+# "GtkSpinButton: setting an adjustment with non-zero page size is deprecated"
+Patch35:         xscreensaver-5.12-gtkspinbox-page-size-to-zero.patch
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -240,6 +244,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch32 -p1 -b .gltext_mem
 %patch33 -p1 -b .xmllist
 %patch34 -p1 -b .flame_blank
+%patch35 -p1 -b .spin_warn
 
 change_option(){
    set +x
@@ -745,9 +750,12 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Oct 28 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.12-6
+- Remove GTK warning about non-zero page-size on GtkSpinButton
+
 * Wed Oct 13 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.12-5
 - Fix the issue that xflame is completely blank (bug 642651)
-
+GtkSpinButton:
 * Wed Oct 13 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.12-4
 - Enable libgle dependent hacks on F-13+