rpms/xscreensaver/devel xscreensaver-5.11-xjack-with-small-window.patch, 1.4, 1.5 xscreensaver.spec, 1.115, 1.116

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8873/devel

Modified Files:
	xscreensaver-5.11-xjack-with-small-window.patch 
	xscreensaver.spec 
Log Message:
* Sun Jul 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-8.1.respin1
- And more fix for the below patch


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

Index: xscreensaver-5.11-xjack-with-small-window.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.11-xjack-with-small-window.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xscreensaver-5.11-xjack-with-small-window.patch	25 Jul 2010 07:30:09 -0000	1.4
+++ xscreensaver-5.11-xjack-with-small-window.patch	25 Jul 2010 17:39:55 -0000	1.5
@@ -1,15 +1,15 @@
 --- xscreensaver-5.11/hacks/xjack.c.small	2008-07-31 18:52:05.000000000 +0900
-+++ xscreensaver-5.11/hacks/xjack.c	2010-07-25 15:48:27.000000000 +0900
-@@ -59,6 +59,10 @@
-   XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
-   st->columns = (st->xgwa.width  - st->hspace - st->hspace) / st->char_width;
-   st->rows    = (st->xgwa.height - st->vspace - st->vspace) / st->line_height;
++++ xscreensaver-5.11/hacks/xjack.c	2010-07-26 02:33:17.000000000 +0900
+@@ -62,6 +62,10 @@
+   st->rows--;
+   st->columns--;
+ 
 +  /* If the window is stupidly small, just truncate. */
 +  if (st->rows < 4)     st->rows = 4;
 +  if (st->columns < 12) st->columns = 12;
 +
-   st->rows--;
-   st->columns--;
+   if (st->y > st->rows)    st->y = st->rows-1;
+   if (st->x > st->columns) st->x = st->columns-2;
  
 @@ -116,9 +120,12 @@
  


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- xscreensaver.spec	25 Jul 2010 07:30:09 -0000	1.115
+++ xscreensaver.spec	25 Jul 2010 17:39:55 -0000	1.116
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    8
+%define fedora_rel    8.1
 
 %define extrarel      .respin1
 
@@ -704,6 +704,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Jul 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-8.1.respin1
+- And more fix for the below patch
+
 * Sun Jul 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-8.respin1
 - Fix xscreensaver-5.11-xjack-with-small-window.patch (bug 617905)