rpms/xscreensaver/F-12 xscreensaver-5.10-apple2-initialization.patch, 1.1, 1.2 xscreensaver.spec, 1.100, 1.101

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25981/F-12

Modified Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver.spec 
Log Message:
fix patch

xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: xscreensaver-5.10-apple2-initialization.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-12/xscreensaver-5.10-apple2-initialization.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 15:50:44 -0000	1.1
+++ xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 18:16:34 -0000	1.2
@@ -1,37 +1,16 @@
---- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
-+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
-@@ -1020,21 +1020,23 @@
-   int i,height;
-   static const double levelfac[3]={-7.5, 5.5, 24.5};
- 
--  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
-+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
- 
-     for (i=0; i<height; i++) {
-       it->leveltable[height][i].index = 2;
+--- xscreensaver-5.10/hacks/analogtv.c.debug1	2008-08-06 10:59:35.000000000 +0900
++++ xscreensaver-5.10/hacks/analogtv.c	2009-12-11 02:55:42.000000000 +0900
+@@ -1030,11 +1030,11 @@
+       it->leveltable[height][0].index=0;
      }
--    
--    if (avgheight>=3) {
--      it->leveltable[height][0].index=0;
--    }
--    if (avgheight>=5) {
+     if (avgheight>=5) {
 -      it->leveltable[height][height-1].index=0;
--    }
--    if (avgheight>=7) {
--      it->leveltable[height][1].index=1;
++      if (height >= 1) it->leveltable[height][height-1].index=0;
+     }
+     if (avgheight>=7) {
+       it->leveltable[height][1].index=1;
 -      it->leveltable[height][height-2].index=1;
-+
-+    if (height < avgheight + 2.0){
-+      if (avgheight>=3) {
-+        it->leveltable[height][0].index=0;
-+      }
-+      if (avgheight>=5) {
-+        if (height >= 1) it->leveltable[height][height-1].index=0;
-+      }
-+      if (avgheight>=7) {
-+        it->leveltable[height][1].index=1;
-+        if (height >= 2) it->leveltable[height][height-2].index=1;
-+      }
++      if (height >= 2) it->leveltable[height][height-2].index=1;
      }
  
      for (i=0; i<height; i++) {


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-12/xscreensaver.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- xscreensaver.spec	10 Dec 2009 15:50:44 -0000	1.100
+++ xscreensaver.spec	10 Dec 2009 18:16:34 -0000	1.101
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    4
 
 %define extrarel      %{nil}
 
@@ -676,9 +676,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
-* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-4
 - Fix occasional crash on substrate (bug 545847)
-- Fix initialization process on apple2, hopefully fix bug 540790
+- Fix initialization process on apple2, hopefully fix bug 540790??
 
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
 - F-12+: Restrict Autostart effect to GNOME session only (bug 517391)