rpms/xscreensaver/F-13 xscreensaver-5.11-xjack-with-small-window.patch, 1.1, 1.2 xscreensaver.spec, 1.108, 1.109

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17683/F-13

Modified Files:
	xscreensaver-5.11-xjack-with-small-window.patch 
	xscreensaver.spec 
Log Message:
fix patch

xscreensaver-5.11-xjack-with-small-window.patch:
 xjack.c |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

Index: xscreensaver-5.11-xjack-with-small-window.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/xscreensaver-5.11-xjack-with-small-window.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscreensaver-5.11-xjack-with-small-window.patch	14 Jun 2010 07:39:11 -0000	1.1
+++ xscreensaver-5.11-xjack-with-small-window.patch	14 Jun 2010 09:10:42 -0000	1.2
@@ -1,5 +1,5 @@
 --- xscreensaver-5.11/hacks/xjack.c.debug	2008-07-31 18:52:05.000000000 +0900
-+++ xscreensaver-5.11/hacks/xjack.c	2010-06-14 16:24:23.000000000 +0900
++++ xscreensaver-5.11/hacks/xjack.c	2010-06-14 17:54:10.000000000 +0900
 @@ -117,8 +117,25 @@
    xjack_reshape (dpy, window, st, st->xgwa.width, st->xgwa.height);
  
@@ -19,8 +19,8 @@
 +    tmp = st->columns - st->left - 10;
 +    if (tmp < 1)
 +    {
-+      st->left = 0;
 +      tmp = 1;
++      st->left = st->columns - 10 - tmp;
 +    }
 +    st->right = st->left + (0xFF & (random() % tmp + 10));
 +  }


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/xscreensaver.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- xscreensaver.spec	14 Jun 2010 07:39:12 -0000	1.108
+++ xscreensaver.spec	14 Jun 2010 09:10:42 -0000	1.109
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    4.1
 
 %define extrarel      .respin1
 
@@ -690,7 +690,7 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
-* Mon Jun 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-4.respin1
+* Mon Jun 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-4.1.respin1
 - Fix crash of xjack when window is too small (bug 603587)
 
 * Sat Jun  5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-3.respin1