[xscreensaver] F-19+: Kill dependency for base on extras, gl-extras subpackage

[Mamoru Tasaka]

commit fab68430962f924ae55ad18ea13a53c1cd025c19
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sun May 19 16:16:22 2013 +0900

    F-19+: Kill dependency for base on extras, gl-extras subpackage
    
    - Fix segfault on pacman (bug 964575)

 xscreensaver-5.21-pacman-array-onebyte_ahead.patch |   20 ++++++++++++++++++++
 xscreensaver.spec                                  |   11 ++++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.21-pacman-array-onebyte_ahead.patch b/xscreensaver-5.21-pacman-array-onebyte_ahead.patch
new file mode 100644
index 0000000..8433ae7
--- /dev/null
+++ b/xscreensaver-5.21-pacman-array-onebyte_ahead.patch
@@ -0,0 +1,20 @@
+--- xscreensaver-5.21/hacks/pacman_level.c.array	2012-06-24 12:24:47.000000000 +0900
++++ xscreensaver-5.21/hacks/pacman_level.c	2013-05-19 16:07:48.000000000 +0900
+@@ -539,7 +539,7 @@
+ {
+     int ret = False;
+     int i;
+-    for (i = 0; i <= NUM_BONUS_DOTS; i++) {
++    for (i = 0; i < NUM_BONUS_DOTS; i++) {
+ /*     fprintf(stderr,"is bonus: passed x (%d, %d) bonus (%d, %d)\n",x,y,bonus_dots[i].x, bonus_dots[i].y); */
+         if (x == pp->bonus_dots[i].x && y == pp->bonus_dots[i].y) {
+             ret = True;
+@@ -553,7 +553,7 @@
+ static void
+ check_bonus_idx (int idx)
+ {
+-    assert (0 <= idx && idx <= NUM_BONUS_DOTS);
++    assert (0 <= idx && idx < NUM_BONUS_DOTS);
+ }
+ 
+ int
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 73184f9..d44ea70 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    5
+%define fedora_rel    6
 
 %undefine extrarel
 
@@ -72,6 +72,8 @@ Patch34:         xscreensaver-5.21-polyominoes-array-bounds.patch
 Patch35:         xscreensaver-5.21-fireworkx-transit.patch
 # Fix engine crash with one byte ahead access (bug 954115)
 Patch36:         xscreensaver-5.21-engine-onebytefix.patch
+# Fix segfault on pacman (bug 964575)
+Patch37:         xscreensaver-5.21-pacman-array-onebyte_ahead.patch
 # driver/test-passwd tty segfaults
 Patch51:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
@@ -143,7 +145,9 @@ Obsoletes:       xscreeensaver-tests < %{epoch}:%{version}-%{release}
 %package extras-base
 Summary:         A base package for screensavers
 Group:           Amusements/Graphics
+%if 0%{?fedora} < 19
 Requires:        %{name}-base = %{epoch}:%{version}-%{release}
+%endif
 # For appres, etc
 Requires:        xorg-x11-resutils
 
@@ -272,6 +276,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch34 -p1 -b .polyominoes_arraybounds
 %patch35 -p1 -b .fireworkx.transit
 %patch36 -p1 -b .engine_onebyte
+%patch37 -p1 -b .pacman_onebyte
 %patch51 -p1 -b .test_passwd
 %patch52 -p1 -b .test_misc
 %patch100 -p1 -b .rpmver
@@ -829,6 +834,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sun May 19 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.21-6
+- F-19+: Kill dependency for base on extras, gl-extras subpackage
+- Fix segfault on pacman (bug 964575)
+
 * Sun Apr 21 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.21-5
 - Don't autostart xscreensaver when mate-screensaver is installed.