[xscreensaver/f14/master] - Enable libgle dependent hacks on F-13+

[Mamoru Tasaka]

commit ce955f3dea8c32850db38b9b2ea7c668798709f5
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Wed Oct 13 20:17:55 2010 +0900

    - Enable libgle dependent hacks on F-13+

 xscreensaver-5.12-xml-duplicate-list.patch |   11 +++++++++++
 xscreensaver.spec                          |   16 +++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.12-xml-duplicate-list.patch b/xscreensaver-5.12-xml-duplicate-list.patch
new file mode 100644
index 0000000..0d0b9c3
--- /dev/null
+++ b/xscreensaver-5.12-xml-duplicate-list.patch
@@ -0,0 +1,11 @@
+--- xscreensaver-5.12/hacks/Makefile.in.list	2010-10-13 18:02:21.000000000 +0900
++++ xscreensaver-5.12/hacks/Makefile.in	2010-10-13 18:28:53.000000000 +0900
+@@ -118,7 +118,7 @@
+ # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
+ # but that are not shipped with xscreensaver itself.
+ #
+-EXTERNALS	= cosmos electricsheep extrusion fireflies goban \
++EXTERNALS	= cosmos electricsheep fireflies goban \
+ 		  sphereeversion ssystem xaos xdaliclock xearth xfishtank \
+ 		  xmountains xplanet xsnow
+ 
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 6104b85..4ac44a3 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    4
 
 %undefine extrarel
 
@@ -61,6 +61,8 @@ Patch31:         xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
 #
 # Kill memleak on gltext (bug 638600)
 Patch32:         xscreensaver-5.12-gltext-memleak.patch
+# Remove duplicate xml files entry
+Patch33:         xscreensaver-5.12-xml-duplicate-list.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -81,6 +83,10 @@ BuildRequires:   sed
 # Use pseudo symlink
 # BuildRequires:   xdg-utils
 BuildRequires:   xorg-x11-proto-devel
+# extrusioni
+%if 0%{?fedora} >= 13
+BuildRequires:   libgle-devel
+%endif
 BuildRequires:   libX11-devel
 BuildRequires:   libXScrnSaver-devel
 BuildRequires:   libXext-devel
@@ -230,6 +236,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch30 -p1 -b .conf264
 %patch31 -p1 -b .langc
 %patch32 -p1 -b .gltext_mem
+%patch33 -p1 -b .xmllist
 
 change_option(){
    set +x
@@ -395,6 +402,10 @@ popd
 %else
 CONFIG_OPTS="$CONFIG_OPTS --without-login-manager"
 %endif
+# Enable extrusion on F-13 and above
+%if 0%{?fedora} <= 12
+CONFIG_OPTS="$CONFIG_OPTS --without-gle"
+%endif
 
 # This is flaky:
 # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -731,6 +742,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Oct 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-4
+- Enable libgle dependent hacks on F-13+
+
 * Wed Oct 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-3
 - Kill memleak on gltext (bug 638600)