rpms/xscreensaver/F-9 xscreensaver-5.07-hacks-fix.patch, NONE, 1.1 xscreensaver.spec, 1.75, 1.76

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.07-hacks-fix.patch 
Log Message:
sync with devel/F-10

xscreensaver-5.07-hacks-fix.patch:

--- NEW FILE xscreensaver-5.07-hacks-fix.patch ---
--- xscreensaver-5.07/hacks/fireworkx.c.debug	2007-11-01 14:21:55.000000000 +0900
+++ xscreensaver-5.07/hacks/fireworkx.c	2008-11-28 10:53:05.000000000 +0900
@@ -462,7 +462,7 @@
 {
   struct state *st = (struct state *) closure;
   if (event->type == ButtonPress) {
-    recycle(st, st->fshell, event->xbutton.x, event->xbutton.y);
+    recycle(st, st->ffshell, event->xbutton.x, event->xbutton.y);
     return True;
   }
   return False;


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xscreensaver.spec	25 Nov 2008 14:56:19 -0000	1.75
+++ xscreensaver.spec	2 Dec 2008 06:32:13 -0000	1.76
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    4
 
 %define extrarel      %{nil}
 
@@ -34,6 +34,7 @@
 Source20:        ja.po.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
+Patch50:         xscreensaver-5.07-hacks-fix.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -186,6 +187,7 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch50 -p1 -b .hacksfix
 
 gzip -dc %SOURCE20 > po/ja.po
 
@@ -631,6 +633,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Nov 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-4
+- Fix fireworkx segfault (bug 473355)
+
 * Wed Nov 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-3
 - Create wrapper script for webcollage to use nonet option
   by default, and rename the original webcollage (bug 472061)