From 49e32cf469c920b427622c6ba20dfbf611071b9b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Thu, 29 May 2008 09:02:07 +0000
Subject: [PATCH 01/96] use %bcond, %with macros for consistency don't use
 quotes around %fedora     macro to make it work with Fedora 10

---
 rss-glx.spec | 93 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 41 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index f79eb2b..1924efd 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -1,48 +1,50 @@
-%define xssconfigdir %{_datadir}/xscreensaver/config
-%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
-%define xssbindir %{_libexecdir}/xscreensaver
-%define gssbindir %{_libexecdir}/gnome-screensaver
-%if 0%{?fedora} > 8
-# KDE4
-%define kdessconfigdir %{_datadir}/kde4/services/ScreenSavers
-%else
-# KDE3
-%define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers
-%endif
-
 %if 0%{?fedora}
-%if "%{fedora}" <= "4"
-%define modular_x 0%{?_with_modular_x:1}
-%define gss 0
-%define _gssconfigdir %{nil}
+%if %{fedora} <= 4
+%bcond_with modular_x
+%bcond_with gss
+%define _gssconfigdir %{nil}%{?gssconfigdir}
 %else
-%define modular_x 0%{!?_without_modular_x:1}
-%define gss 1
-%if "%{fedora}" <= "5"
+%bcond_without modular_x
+%bcond_without gss
+%if %{fedora} <= 5
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/gnome-screensaver/themes}%{?gssconfigdir}
 %else
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
-%if "%{fedora}" >= "7"
-%define modular_xss 0%{?!_without_modular_xss:1}
+%if %{fedora} >= 7
+%bcond_without modular_xss
 %else
-%define modular_xss 0%{?_with_modular_xss:1}
+%bcond_with modular_xss
+%endif
+%if %{fedora} >= 8
+# KDE4
+%bcond_without kde4
+%else
+# KDE3
+%bcond_with kde4
 %endif
 %endif
 %else
-%define modular_x 0%{?!_without_modular_x:1}
-%define modular_xss 0%{?!_without_modular_xss:1}
-%define gss 0%{?!_without_gss:1}
+%bcond_without modular_x
+%bcond_without modular_xss
+%bcond_without gss
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
 
-%define with_matrixview 0%{?_with_matrixview:1}
-%define patchext %{nil}%{?with_matrixview:.p}
+%define kdessconfigdir %{?with_kde4:%{_datadir}/kde4/services/ScreenSavers}%{!?with_kde4:%{_datadir}/applnk/System/ScreenSavers}
+
+%define xssconfigdir %{_datadir}/xscreensaver/config
+%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
+%define xssbindir %{_libexecdir}/xscreensaver
+%define gssbindir %{_libexecdir}/gnome-screensaver
+
+%bcond_with matrixview
+%define patchext %{nil}%{!?with_matrixview:.p}
 
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -59,10 +61,10 @@ Patch2: rss-glx-0.8.1-gcc43-buildfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %with_matrixview
+%if %{with matrixview}
 BuildRequires: ImageMagick-devel >= 6.2.5.4
 %endif
-%if %modular_x
+%if %{with modular_x}
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
@@ -89,7 +91,7 @@ order to use them as screensavers.
 Summary: Really Slick Screensavers
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if %modular_xss
+%if %{with modular_xss}
 Requires(post): xscreensaver-base >= 1:5.03-3
 Requires(postun): xscreensaver-base >= 1:5.03-3
 %else
@@ -105,7 +107,7 @@ impressive and graphically intensive screensavers.
 
 This package contains files needed to use the hacks with xscreensaver.
 
-%if %gss
+%if %{with gss}
 %package gnome-screensaver
 Summary: Really Slick Screensavers
 Group: Amusements/Graphics
@@ -140,27 +142,32 @@ This package contains files needed to use the hacks with KDE.
 cat << EOF
 
 Build settings:
-%if %modular_x
+%if %{with modular_x}
 - with modular X
 %else
 - with monolithic X
 %endif
-%if %gss
+%if %{with gss}
 - with gnome-screensaver support,
   theme directory: %{_gssconfigdir}
 %else
 - without gnome-screensaver support
 %endif
-%if %with_matrixview
+%if %{with matrixview}
 - with matrixview hack
 %else
 - without matrixview hack
 %endif
-%if %modular_xss
+%if %{with modular_xss}
 - with modular xscreensaver support
 %else
 - without modular xscreensaver support
 %endif
+%if %{with kde4}
+- with KDE4 support in: %kdessconfigdir
+%else
+- with KDE3 support in: %kdessconfigdir
+%endif
 
 EOF
 %setup -q -n rss-glx_%{version}
@@ -187,7 +194,7 @@ make %{?_smp_mflags}
 generate_fix_desktop_files_links () {
 	local line name trycmd cmd desc
 	while read line; do
-%if %gss
+%if %{with gss}
         # generate GNOME screensaver desktop files
 		eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; cmd=\"rss-glx-" $2 "\"; desc=\"" $3 "\""}')
 		trycmd="${cmd%%%% *}"
@@ -227,7 +234,7 @@ rm -rf %buildroot
 install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}%{_libdir}/lib*.{,l}a %{buildroot}%{_bindir}/rss-glx_install.pl
-%if %gss
+%if %{with gss}
 mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
 mkdir -p %{buildroot}%{xssbindir}
@@ -247,7 +254,7 @@ Hufo's Smoke§hufo_smoke§Smoke effect.
 Hufo's Tunnel§hufo_tunnel§Inside a tunnel.
 Hyperspace§hyperspace§Hyperspace.
 Lattice§lattice§Fly through an endless world of linked rings.
-%if %with_matrixview
+%if %{with matrixview}
 MatrixView§matrixview§The Matrix.
 %endif
 Plasma§plasma§Probably the second most psychedelic screensaver in existence.
@@ -261,7 +268,7 @@ EOF
 %clean
 rm -rf %buildroot
 
-%if %modular_xss
+%if %{with modular_xss}
 %post xscreensaver
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks
@@ -288,7 +295,7 @@ fi
 %dir %{xssbindir}
 %{xssbindir}/*
 
-%if %gss
+%if %{with gss}
 %files gnome-screensaver
 %defattr(-, root, root)
 %dir %{_gssconfigdir}
@@ -303,6 +310,10 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Thu May 29 2008 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-20
+- use %%bcond, %%with macros for consistency
+- don't use quotes around %%fedora macro to make it work with Fedora 10
+
 * Wed Apr 02 2008 Rex Dieter <rdieter@fedoraproject.org> 0.8.1.p-19
 - -kde: drop Requires: kdebase (kdeartwork dep is enough)
 - fix %%kdessconfigdir for kde4

From 25cbabf44921ff64f6cab7ed72bfd6c4e42f9ea4 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Thu, 29 May 2008 09:55:19 +0000
Subject: [PATCH 02/96] use correct binary names for KDE (#448844)

---
 rss-glx.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 1924efd..c358517 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -78,6 +78,7 @@ BuildRequires: freealut-devel
 BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: gawk
+BuildRequires: sed
 
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -97,7 +98,7 @@ Requires(postun): xscreensaver-base >= 1:5.03-3
 %else
 Requires: xscreensaver-base < 1:5.03-3
 %endif
-%if %{?fedora}%{!fedora} >= 7
+%if 0%{?fedora} >= 7
 Requires: xscreensaver-gl-base
 %endif
 
@@ -217,7 +218,7 @@ EOF
         # fix KDE screensaver desktop files
         pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null
         if [ ! -f "${trycmd}.desktop" ]; then
-            awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${origtrycmd}.desktop" > "${trycmd}.desktop"
+            awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${origtrycmd}.desktop" | sed 's@^Exec=\(.*\)'"$origtrycmd"'\(.*\)$@Exec=\1'"$trycmd"'\2@g' > "${trycmd}.desktop"
             rm -f "${origtrycmd}.desktop"
         fi
         popd >& /dev/null
@@ -313,6 +314,7 @@ fi
 * Thu May 29 2008 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-20
 - use %%bcond, %%with macros for consistency
 - don't use quotes around %%fedora macro to make it work with Fedora 10
+- use correct binary names for KDE (#448844)
 
 * Wed Apr 02 2008 Rex Dieter <rdieter@fedoraproject.org> 0.8.1.p-19
 - -kde: drop Requires: kdebase (kdeartwork dep is enough)

From 66961ca153389fd5f3e59539528cdc1f5631b521 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Wed, 17 Dec 2008 16:36:54 +0000
Subject: [PATCH 03/96] version 0.8.2.p remove obsolete freealut patch update
 flags, gcc43 patches     correct KDE desktop files so that they work with KDE
 4.1 remove     encoding lines from desktop files as they're deprecated

---
 .cvsignore                                    |  2 +-
 rss-glx-0.8.1-flags.patch                     | 34 ------------
 rss-glx-0.8.1-freealut.patch                  | 47 -----------------
 rss-glx-0.8.1-gcc43-buildfix.patch            | 22 --------
 ...0.8.1.p.diff => rss-glx-0.8.2-0.8.2.p.diff | 52 ++++++++++---------
 rss-glx-0.8.2.p-flags.patch                   | 34 ++++++++++++
 rss-glx-0.8.2.p-gcc43.patch                   | 12 +++++
 rss-glx-rm-matrixview.sh                      |  4 +-
 rss-glx.spec                                  | 47 ++++++++++++-----
 sources                                       |  2 +-
 10 files changed, 111 insertions(+), 145 deletions(-)
 delete mode 100644 rss-glx-0.8.1-flags.patch
 delete mode 100644 rss-glx-0.8.1-freealut.patch
 delete mode 100644 rss-glx-0.8.1-gcc43-buildfix.patch
 rename rss-glx-0.8.1-0.8.1.p.diff => rss-glx-0.8.2-0.8.2.p.diff (67%)
 create mode 100644 rss-glx-0.8.2.p-flags.patch
 create mode 100644 rss-glx-0.8.2.p-gcc43.patch

diff --git a/.cvsignore b/.cvsignore
index c486bd5..ad95d36 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rss-glx_0.8.1.p.tar.bz2
+rss-glx_0.8.2.p.tar.bz2
diff --git a/rss-glx-0.8.1-flags.patch b/rss-glx-0.8.1-flags.patch
deleted file mode 100644
index e31cca5..0000000
--- a/rss-glx-0.8.1-flags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- rss-glx_0.8.1.p/configure.in.flags	2006-06-02 11:38:10.000000000 +0200
-+++ rss-glx_0.8.1.p/configure.in	2006-06-02 12:29:35.000000000 +0200
-@@ -7,17 +7,27 @@
- AC_PROG_AWK
- 
- AC_PROG_CC
--CFLAGS=-g
- AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
-     [build with debugging information default=yes])],
--    [test "$enableval" = "no" && CFLAGS="-O2"])
-+    [
-+     if test "$enableval" = "no"; then
-+         : ${CFLAGS="-O2"}
-+     else
-+         : ${CFLAGS="-g"}
-+     fi
-+     ])
- CFLAGS="$CFLAGS -Wall"
- 
- AC_PROG_CXX
--CXXFLAGS=-g
- AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
-     [build with debugging information default=yes])],
--    [test "$enableval" = "no" && CXXFLAGS="-O2"])
-+    [
-+     if test "$enableval" = "no"; then
-+         : ${CXXFLAGS="-O2"}
-+     else
-+         : ${CXXFLAGS="-g"}
-+     fi
-+     ])
- CXXFLAGS="$CXXFLAGS -Wall"
- 
- AC_PROG_INSTALL
diff --git a/rss-glx-0.8.1-freealut.patch b/rss-glx-0.8.1-freealut.patch
deleted file mode 100644
index 014a89c..0000000
--- a/rss-glx-0.8.1-freealut.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- rss-glx_0.8.1.p/configure.in.freealut	2006-03-10 15:38:37.000000000 +0100
-+++ rss-glx_0.8.1.p/configure.in	2006-03-28 17:38:02.000000000 +0200
-@@ -114,14 +114,30 @@
- 		if test "x$ac_cv_header_AL_alut_h" = "xyes" ; then
- 			# Check for OpenAL library
- 			AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, -lopenal) AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
-+            alut_libs_sav="$LIBS"
-+			if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
-+                echo "... checking with separate -lalut";
-+				unset ac_cv_lib_openal_alutInit
-+                LIBS="$LIBS -lalut"
-+			    AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
-+            fi
-+            LIBS="$alut_libs_sav"
- 
- 			if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
--				libs_sav=$LIBS
-+				libs_sav="$LIBS"
- 				LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS -L/usr/local/lib"
- 
- 				echo "Hrm, maybe -lopenal is in /usr/local/lib";
- 				unset ac_cv_lib_openal_alutInit
- 				AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, -lopenal) AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
-+                alut_libs_sav="$LIBS"
-+			    if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
-+                    echo "... checking with separate -lalut";
-+				    unset ac_cv_lib_openal_alutInit
-+                    LIBS="$LIBS -lalut"
-+			        AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
-+                fi
-+                LIBS="$alut_libs_sav"
- 
- 				if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
- 					# For FreeBSD -current
-@@ -132,6 +148,12 @@
- 
- 					unset ac_cv_lib_openal_alutInit
- 					AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lc_r") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
-+			        if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
-+                        echo "... checking with separate -lalut";
-+				        unset ac_cv_lib_openal_alutInit
-+                        LIBS="$LIBS -lalut"
-+			            AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut -lc_r") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
-+                    fi
- 
- 					LIBS=$libs_cr_sav
- 
diff --git a/rss-glx-0.8.1-gcc43-buildfix.patch b/rss-glx-0.8.1-gcc43-buildfix.patch
deleted file mode 100644
index c42e048..0000000
--- a/rss-glx-0.8.1-gcc43-buildfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -upNr rss-glx_0.8.1.p.orign/reallyslick/cpp_src/skyrocket_sound.cpp rss-glx_0.8.1.p/reallyslick/cpp_src/skyrocket_sound.cpp
---- rss-glx_0.8.1.p.orign/reallyslick/cpp_src/skyrocket_sound.cpp	2005-04-10 01:00:43.000000000 +0200
-+++ rss-glx_0.8.1.p/reallyslick/cpp_src/skyrocket_sound.cpp	2008-01-04 14:36:38.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <AL/al.h>
- #include <AL/alut.h>
- 
-+#include <cstdlib>
- #include <list>
- 
- #include "loadTexture.h"
-diff -upNr rss-glx_0.8.1.p.orign/reallyslick/Implicit/impSurface.cpp rss-glx_0.8.1.p/reallyslick/Implicit/impSurface.cpp
---- rss-glx_0.8.1.p.orign/reallyslick/Implicit/impSurface.cpp	2005-04-09 22:13:51.000000000 +0200
-+++ rss-glx_0.8.1.p/reallyslick/Implicit/impSurface.cpp	2008-01-04 14:37:07.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <Implicit/impSurface.h>
- #include <math.h>
- #include <iostream>
-+#include <cstring>
- 
- 
- 
diff --git a/rss-glx-0.8.1-0.8.1.p.diff b/rss-glx-0.8.2-0.8.2.p.diff
similarity index 67%
rename from rss-glx-0.8.1-0.8.1.p.diff
rename to rss-glx-0.8.2-0.8.2.p.diff
index b243787..81624f3 100644
--- a/rss-glx-0.8.1-0.8.1.p.diff
+++ b/rss-glx-0.8.2-0.8.2.p.diff
@@ -1,26 +1,26 @@
-diff -ur rss-glx_0.8.1/ChangeLog rss-glx_0.8.1.p/ChangeLog
---- rss-glx_0.8.1/ChangeLog	2006-02-25 23:02:11.000000000 +0100
-+++ rss-glx_0.8.1.p/ChangeLog	2006-03-10 15:25:10.000000000 +0100
+diff -ur rss-glx_0.8.2/ChangeLog rss-glx_0.8.2.p/ChangeLog
+--- rss-glx_0.8.2/ChangeLog	2008-09-01 03:38:28.000000000 +0200
++++ rss-glx_0.8.2.p/ChangeLog	2008-12-16 15:41:14.000000000 +0100
 @@ -1,3 +1,7 @@
-+****************************** Version 0.8.1.p ********************************
++****************************** Version 0.8.2.p ********************************
 +
 +	Removed matrixview
 +
- ******************************* Version 0.8.1 *********************************
+ ******************************* Version 0.8.2 *********************************
  
- 	Pulled in vroot.h patch from Ari Pollak's Debian package.
-diff -ur rss-glx_0.8.1/configure.in rss-glx_0.8.1.p/configure.in
---- rss-glx_0.8.1/configure.in	2006-02-25 22:10:54.000000000 +0100
-+++ rss-glx_0.8.1.p/configure.in	2006-03-10 15:38:37.000000000 +0100
+ 	Limit frame rate to vertical refresh by default if compiled with GLEW
+diff -ur rss-glx_0.8.2/configure.in rss-glx_0.8.2.p/configure.in
+--- rss-glx_0.8.2/configure.in	2008-09-01 03:30:28.000000000 +0200
++++ rss-glx_0.8.2.p/configure.in	2008-12-16 15:41:49.000000000 +0100
 @@ -1,6 +1,6 @@
  # Process this file with autoconf to produce a configure script.
  AC_INIT(src/driver.cpp)
 -AM_INIT_AUTOMAKE(rss-glx,0.7.3)
-+AM_INIT_AUTOMAKE(rss-glx,0.8.1.p)
++AM_INIT_AUTOMAKE(rss-glx,0.8.2.p)
  AM_CONFIG_HEADER(config.h)
  
  # Checks for programs.
-@@ -177,9 +177,6 @@
+@@ -126,9 +126,6 @@
          AC_CHECK_LIB([MesaGLU],[gluLookAt],,AC_MSG_ERROR(GLU library was not found.))
  fi
  
@@ -30,11 +30,12 @@ diff -ur rss-glx_0.8.1/configure.in rss-glx_0.8.1.p/configure.in
  AC_CHECK_HEADERS([GL/glew.h])
  
  if test "x$ac_cv_header_GL_glew_h" = "xyes" ; then
-diff -ur rss-glx_0.8.1/other_src/Makefile.am rss-glx_0.8.1.p/other_src/Makefile.am
---- rss-glx_0.8.1/other_src/Makefile.am	2006-02-25 22:14:53.000000000 +0100
-+++ rss-glx_0.8.1.p/other_src/Makefile.am	2006-03-10 15:21:57.000000000 +0100
-@@ -1,35 +1,20 @@
+diff -ur rss-glx_0.8.2/other_src/Makefile.am rss-glx_0.8.2.p/other_src/Makefile.am
+--- rss-glx_0.8.2/other_src/Makefile.am	2008-06-30 02:59:56.000000000 +0200
++++ rss-glx_0.8.2.p/other_src/Makefile.am	2008-12-16 15:42:54.000000000 +0100
+@@ -1,36 +1,21 @@
  INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
+ AM_LDFLAGS=@GLEW@
  
 -bin_PROGRAMS = biof busyspheres matrixview spirographx sundancer2
 +bin_PROGRAMS = biof busyspheres spirographx sundancer2
@@ -73,19 +74,20 @@ diff -ur rss-glx_0.8.1/other_src/Makefile.am rss-glx_0.8.1.p/other_src/Makefile.
 -
 -CLEANFILES = matrixview_textures.c
 -
-diff -ur rss-glx_0.8.1/README rss-glx_0.8.1.p/README
---- rss-glx_0.8.1/README	2006-02-25 22:47:58.000000000 +0100
-+++ rss-glx_0.8.1.p/README	2006-03-10 15:38:44.000000000 +0100
-@@ -1,6 +1,4 @@
+diff -ur rss-glx_0.8.2/README rss-glx_0.8.2.p/README
+--- rss-glx_0.8.2/README	2008-08-31 04:38:42.000000000 +0200
++++ rss-glx_0.8.2.p/README	2008-12-16 15:43:14.000000000 +0100
+@@ -1,7 +1,5 @@
  Requirements: 
  	(1) Recent gcc/g++ (2.95.x, 3.x).
  	(2) X11+GLX.
 -	(3) ImageMagick >6.2
  	(4) OPTIONAL: OpenAL for sound. (skyrocket)
 -	(5) OPTIONAL: pthreads for smoother image loading. (matrixview)
-diff -ur rss-glx_0.8.1/README.xscreensaver rss-glx_0.8.1.p/README.xscreensaver
---- rss-glx_0.8.1/README.xscreensaver	2005-04-10 04:16:42.000000000 +0200
-+++ rss-glx_0.8.1.p/README.xscreensaver	2006-03-10 15:25:26.000000000 +0100
+ 	(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
+diff -ur rss-glx_0.8.2/README.xscreensaver rss-glx_0.8.2.p/README.xscreensaver
+--- rss-glx_0.8.2/README.xscreensaver	2005-04-10 04:16:42.000000000 +0200
++++ rss-glx_0.8.2.p/README.xscreensaver	2008-12-16 15:43:32.000000000 +0100
 @@ -28,6 +28,5 @@
    GL:                   "BioF"  biof --root                                 \n\
    GL:            "BusySpheres"  busyspheres --root                          \n\
@@ -93,9 +95,9 @@ diff -ur rss-glx_0.8.1/README.xscreensaver rss-glx_0.8.1.p/README.xscreensaver
 -  GL:             "MatrixView"  matrixview --root                           \n\
  -- End Here --
  
-diff -ur rss-glx_0.8.1/utils/rss-glx_install.pl rss-glx_0.8.1.p/utils/rss-glx_install.pl
---- rss-glx_0.8.1/utils/rss-glx_install.pl	2005-04-10 04:09:41.000000000 +0200
-+++ rss-glx_0.8.1.p/utils/rss-glx_install.pl	2006-03-10 15:24:13.000000000 +0100
+diff -ur rss-glx_0.8.2/utils/rss-glx_install.pl rss-glx_0.8.2.p/utils/rss-glx_install.pl
+--- rss-glx_0.8.2/utils/rss-glx_install.pl	2005-04-10 04:09:41.000000000 +0200
++++ rss-glx_0.8.2.p/utils/rss-glx_install.pl	2008-12-16 15:43:55.000000000 +0100
 @@ -26,7 +26,6 @@
  $screensavers->{'biof'} 	= '  GL:                   "BioF"  biof --root                                 \\n\\';
  $screensavers->{'busyspheres'} 	= '  GL:            "BusySpheres"  busyspheres --root                          \\n\\';
diff --git a/rss-glx-0.8.2.p-flags.patch b/rss-glx-0.8.2.p-flags.patch
new file mode 100644
index 0000000..be1e98f
--- /dev/null
+++ b/rss-glx-0.8.2.p-flags.patch
@@ -0,0 +1,34 @@
+diff -up rss-glx_0.8.2.p/configure.in.flags rss-glx_0.8.2.p/configure.in
+--- rss-glx_0.8.2.p/configure.in.flags	2008-12-16 15:51:05.000000000 +0100
++++ rss-glx_0.8.2.p/configure.in	2008-12-16 16:06:51.000000000 +0100
+@@ -9,18 +9,26 @@ AC_PROG_AWK
+ AC_PROG_CC
+ AC_GNU_SOURCE
+ 
+-CFLAGS=-O2
+ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
+     [build with debugging information default=no])],
+-    [test "$enableval" = "yes" && CFLAGS="-g"])
++    [if test "$enableval" = "yes"; then
++        : ${CFLAGS="-g"}
++     else
++        : ${CFLAGS="-O2"}
++     fi
++     ])
+ CFLAGS="$CFLAGS -Wall"
+ 
+ AC_PROG_CXX
+ 
+-CXXFLAGS=-O2
+ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
+     [build with debugging information default=no])],
+-    [test "$enableval" = "yes" && CXXFLAGS="-g"])
++    [if test "$enableval" = "yes"; then
++        : ${CXXFLAGS="-g"}
++     else
++        : ${CXXFLAGS="-O2"}
++     fi
++     ])
+ CXXFLAGS="$CXXFLAGS -Wall"
+ 
+ AC_PROG_INSTALL
diff --git a/rss-glx-0.8.2.p-gcc43.patch b/rss-glx-0.8.2.p-gcc43.patch
new file mode 100644
index 0000000..0adecec
--- /dev/null
+++ b/rss-glx-0.8.2.p-gcc43.patch
@@ -0,0 +1,12 @@
+diff -up rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp.gcc43 rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp
+--- rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp.gcc43	2005-04-10 01:00:43.000000000 +0200
++++ rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp	2008-12-16 16:09:40.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <AL/al.h>
+ #include <AL/alut.h>
+ 
++#include <cstdlib>
+ #include <list>
+ 
+ #include "loadTexture.h"
+diff -up rss-glx_0.8.2.p/reallyslick/Implicit/impSurface.cpp.gcc43 rss-glx_0.8.2.p/reallyslick/Implicit/impSurface.cpp
diff --git a/rss-glx-rm-matrixview.sh b/rss-glx-rm-matrixview.sh
index b6fd209..76fe2e9 100644
--- a/rss-glx-rm-matrixview.sh
+++ b/rss-glx-rm-matrixview.sh
@@ -87,10 +87,10 @@ set -x
 for i in $mv_files; do
     rm -r "$i" || exit 4
 done
-set +x
 
 echo "Applying diff file."
-patch -p1 < "$diff_file" || exit 5
+cat "$diff_file" | patch -p1 || exit 5
+set +x
 
 
 echo 'Regenerating auto* files:'
diff --git a/rss-glx.spec b/rss-glx.spec
index c358517..458c837 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -43,8 +43,8 @@
 
 Summary: Really Slick Screensavers
 Name: rss-glx
-Version: 0.8.1%{patchext}
-Release: 20%{?dist}
+Version: 0.8.2%{patchext}
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -54,10 +54,9 @@ URL: http://rss-glx.sourceforge.net/
 Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
 Source2: rss-glx-rm-matrixview.sh
-Source3: rss-glx-0.8.1-0.8.1.p.diff
-Patch0: rss-glx-0.8.1-freealut.patch
-Patch1: rss-glx-0.8.1-flags.patch
-Patch2: rss-glx-0.8.1-gcc43-buildfix.patch
+Source3: rss-glx-0.8.2-0.8.2.p.diff
+Patch0: rss-glx-0.8.2.p-flags.patch
+Patch1: rss-glx-0.8.2.p-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -73,7 +72,6 @@ BuildRequires: libXt-devel
 BuildRequires: xorg-x11-devel
 %endif
 BuildRequires: bzip2-devel
-BuildRequires: openal-devel
 BuildRequires: freealut-devel
 BuildRequires: autoconf
 BuildRequires: libtool
@@ -172,9 +170,8 @@ Build settings:
 
 EOF
 %setup -q -n rss-glx_%{version}
-%patch0 -p1 -b .freealut
-%patch1 -p1 -b .flags
-%patch2 -p1 -b .gcc43
+%patch0 -p1 -b .flags
+%patch1 -p1 -b .gcc43
 
 # work around BZ #189928
 for f in `find . -type l` ; do
@@ -203,7 +200,6 @@ generate_fix_desktop_files_links () {
 		cat << EOF > %{buildroot}%{_gssconfigdir}/${cmd}.desktop
 
 [Desktop Entry]
-Encoding=UTF-8
 Name=${name}
 Comment=${desc}
 TryExec=${trycmd}
@@ -218,7 +214,23 @@ EOF
         # fix KDE screensaver desktop files
         pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null
         if [ ! -f "${trycmd}.desktop" ]; then
-            awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${origtrycmd}.desktop" | sed 's@^Exec=\(.*\)'"$origtrycmd"'\(.*\)$@Exec=\1'"$trycmd"'\2@g' > "${trycmd}.desktop"
+            awk '
+{
+    if ($0 ~ "^Actions=") {
+        print "Actions=InWindow;Root;Setup;";
+        print "X-KDE-Category=Really Slick Screensavers";
+        print "X-KDE-Type=OpenGL";
+    } else {
+        if ($0 ~ "^Type=") {
+            print "Type=Service";
+            print "X-KDE-ServiceTypes=ScreenSaver";
+        } else {
+            if ($0 !~ "^Encoding=") {
+                print;
+            }
+        }
+    }
+}' < "${origtrycmd}.desktop" | sed 's@^Exec=\(.*\)'"$origtrycmd"'\(.*\)$@Exec=\1'"$trycmd"'\2@g' > "${trycmd}.desktop"
             rm -f "${origtrycmd}.desktop"
         fi
         popd >& /dev/null
@@ -284,7 +296,7 @@ fi
 %files
 %defattr(-, root, root)
 %doc ChangeLog COPYING INSTALL README
-%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.1-0.8.1.p.diff
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.2-0.8.2.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
 
@@ -311,6 +323,15 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Wed Dec 17 2008 Nils Philippsen <nils@redhat.com>
+- correct KDE desktop files so that they work with KDE 4.1
+- remove encoding lines from desktop files as they're deprecated
+
+* Tue Dec 16 2008 Nils Philippsen <nils@redhat.com>
+- version 0.8.2.p
+- remove obsolete freealut patch
+- update flags, gcc43 patches
+
 * Thu May 29 2008 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-20
 - use %%bcond, %%with macros for consistency
 - don't use quotes around %%fedora macro to make it work with Fedora 10
diff --git a/sources b/sources
index aaac6ec..e025fd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17870ad88d3a61ace94c04cb7677ddbf  rss-glx_0.8.1.p.tar.bz2
+cf7ae652531ddb0941cedaf74db70859  rss-glx_0.8.2.p.tar.bz2

From d5157f40bd24324de8124c5055d7be9ae3076831 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Thu, 18 Dec 2008 10:15:20 +0000
Subject: [PATCH 04/96] don't have symlinked autofoo files in tarball

---
 rss-glx-rm-matrixview.sh | 4 +---
 sources                  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/rss-glx-rm-matrixview.sh b/rss-glx-rm-matrixview.sh
index 76fe2e9..76d4a31 100644
--- a/rss-glx-rm-matrixview.sh
+++ b/rss-glx-rm-matrixview.sh
@@ -95,9 +95,7 @@ set +x
 
 echo 'Regenerating auto* files:'
 set -x
-aclocal || exit 6
-automake || exit 7
-autoconf || exit 8
+autoreconf -fi || exit 6
 rm -rf autom4te.cache || :
 set +x
 
diff --git a/sources b/sources
index e025fd9..63f8a29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf7ae652531ddb0941cedaf74db70859  rss-glx_0.8.2.p.tar.bz2
+6bb34d2337ec1d6e2cb4477e15f8f3d0  rss-glx_0.8.2.p.tar.bz2

From 9f42a63934956601ca49b9fb1229360dc26cb7d4 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Thu, 18 Dec 2008 10:37:32 +0000
Subject: [PATCH 05/96] don't force remaking files to (hopefully) appease
 libtool on Rawhide

---
 rss-glx-rm-matrixview.sh | 2 +-
 sources                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rss-glx-rm-matrixview.sh b/rss-glx-rm-matrixview.sh
index 76d4a31..cc8a662 100644
--- a/rss-glx-rm-matrixview.sh
+++ b/rss-glx-rm-matrixview.sh
@@ -95,7 +95,7 @@ set +x
 
 echo 'Regenerating auto* files:'
 set -x
-autoreconf -fi || exit 6
+autoreconf -i || exit 6
 rm -rf autom4te.cache || :
 set +x
 
diff --git a/sources b/sources
index 63f8a29..098e694 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6bb34d2337ec1d6e2cb4477e15f8f3d0  rss-glx_0.8.2.p.tar.bz2
+c0475d1af59aab8febe5e6c98c048ff7  rss-glx_0.8.2.p.tar.bz2

From ac32450041a0344758d78883b41b4e133c51b1ab Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Thu, 18 Dec 2008 11:05:02 +0000
Subject: [PATCH 06/96] manually remove symlinked autofoo scripts

---
 rss-glx-rm-matrixview.sh | 1 +
 sources                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rss-glx-rm-matrixview.sh b/rss-glx-rm-matrixview.sh
index cc8a662..82c0e09 100644
--- a/rss-glx-rm-matrixview.sh
+++ b/rss-glx-rm-matrixview.sh
@@ -95,6 +95,7 @@ set +x
 
 echo 'Regenerating auto* files:'
 set -x
+rm -f config.guess config.sub ltmain.sh || :
 autoreconf -i || exit 6
 rm -rf autom4te.cache || :
 set +x
diff --git a/sources b/sources
index 098e694..cf5fc5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0475d1af59aab8febe5e6c98c048ff7  rss-glx_0.8.2.p.tar.bz2
+f5c04adbb538a6d74ce50ef091428021  rss-glx_0.8.2.p.tar.bz2

From 6deeac9cf7f7372e756ae73615787864d52391b4 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 22 Dec 2008 16:27:24 +0000
Subject: [PATCH 07/96] use autoreconf to avoid using non-matching ltmain.sh

---
 rss-glx.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 458c837..6fc4db2 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -73,11 +73,16 @@ BuildRequires: xorg-x11-devel
 %endif
 BuildRequires: bzip2-devel
 BuildRequires: freealut-devel
-BuildRequires: autoconf
-BuildRequires: libtool
 BuildRequires: gawk
 BuildRequires: sed
 
+## the following deps are needed for autoreconf after applying patches
+# no translations -> no gettext needed
+#BuildRequires: gettext
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
 impressive and graphically intensive screensavers.
@@ -181,7 +186,7 @@ for f in `find . -type l` ; do
 done
 
 %build
-autoconf
+autoreconf -i
 %configure \
     --with-configdir=%{xssconfigdir} \
     --with-kdessconfigdir=%{kdessconfigdir} \
@@ -323,6 +328,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Dec 22 2008 Nils Philippsen <nils@redhat.com> 0.8.2.p-1
+- use autoreconf to avoid using non-matching ltmain.sh
+
 * Wed Dec 17 2008 Nils Philippsen <nils@redhat.com>
 - correct KDE desktop files so that they work with KDE 4.1
 - remove encoding lines from desktop files as they're deprecated

From e148cc5b1bd8361aac2e8d9e1159a20d02cff477 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 25 Feb 2009 20:38:06 +0000
Subject: [PATCH 08/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 6fc4db2..098b6ed 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.2%{patchext}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -328,6 +328,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2.p-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 22 2008 Nils Philippsen <nils@redhat.com> 0.8.2.p-1
 - use autoreconf to avoid using non-matching ltmain.sh
 

From 63938612902c0e7977376f31d924fe18e61a5d31 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Mon, 27 Jul 2009 03:16:13 +0000
Subject: [PATCH 09/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 098b6ed..60b737a 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.2%{patchext}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -328,6 +328,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2.p-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2.p-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

From 223408e38a9594c15c27df4f654cf355acf5797a Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 17 Aug 2009 15:09:38 +0000
Subject: [PATCH 10/96] version 0.9.0.p build with GLEW don't distribute README
 replace flags by     optflags patch remove obsolete gcc-4.3 patch remove
 symlinked source     files workaround (#189928)

---
 .cvsignore                     |   2 +-
 rss-glx-0.8.2-0.8.2.p.diff     | 108 ---------------------------------
 rss-glx-0.8.2.p-flags.patch    |  34 -----------
 rss-glx-0.8.2.p-gcc43.patch    |  12 ----
 rss-glx-0.9.0-0.9.0.p.diff     |  91 +++++++++++++++++++++++++++
 rss-glx-0.9.0.p-optflags.patch |  32 ++++++++++
 rss-glx-rm-matrixview.sh       |   2 +-
 rss-glx.spec                   |  53 ++++++++--------
 sources                        |   2 +-
 9 files changed, 154 insertions(+), 182 deletions(-)
 delete mode 100644 rss-glx-0.8.2-0.8.2.p.diff
 delete mode 100644 rss-glx-0.8.2.p-flags.patch
 delete mode 100644 rss-glx-0.8.2.p-gcc43.patch
 create mode 100644 rss-glx-0.9.0-0.9.0.p.diff
 create mode 100644 rss-glx-0.9.0.p-optflags.patch

diff --git a/.cvsignore b/.cvsignore
index ad95d36..92a4abf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rss-glx_0.8.2.p.tar.bz2
+rss-glx_0.9.0.p.tar.bz2
diff --git a/rss-glx-0.8.2-0.8.2.p.diff b/rss-glx-0.8.2-0.8.2.p.diff
deleted file mode 100644
index 81624f3..0000000
--- a/rss-glx-0.8.2-0.8.2.p.diff
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -ur rss-glx_0.8.2/ChangeLog rss-glx_0.8.2.p/ChangeLog
---- rss-glx_0.8.2/ChangeLog	2008-09-01 03:38:28.000000000 +0200
-+++ rss-glx_0.8.2.p/ChangeLog	2008-12-16 15:41:14.000000000 +0100
-@@ -1,3 +1,7 @@
-+****************************** Version 0.8.2.p ********************************
-+
-+	Removed matrixview
-+
- ******************************* Version 0.8.2 *********************************
- 
- 	Limit frame rate to vertical refresh by default if compiled with GLEW
-diff -ur rss-glx_0.8.2/configure.in rss-glx_0.8.2.p/configure.in
---- rss-glx_0.8.2/configure.in	2008-09-01 03:30:28.000000000 +0200
-+++ rss-glx_0.8.2.p/configure.in	2008-12-16 15:41:49.000000000 +0100
-@@ -1,6 +1,6 @@
- # Process this file with autoconf to produce a configure script.
- AC_INIT(src/driver.cpp)
--AM_INIT_AUTOMAKE(rss-glx,0.7.3)
-+AM_INIT_AUTOMAKE(rss-glx,0.8.2.p)
- AM_CONFIG_HEADER(config.h)
- 
- # Checks for programs.
-@@ -126,9 +126,6 @@
-         AC_CHECK_LIB([MesaGLU],[gluLookAt],,AC_MSG_ERROR(GLU library was not found.))
- fi
- 
--# Check for ImageMagick.
--PKG_CHECK_MODULES(Wand, Wand >= 6.2)
--
- AC_CHECK_HEADERS([GL/glew.h])
- 
- if test "x$ac_cv_header_GL_glew_h" = "xyes" ; then
-diff -ur rss-glx_0.8.2/other_src/Makefile.am rss-glx_0.8.2.p/other_src/Makefile.am
---- rss-glx_0.8.2/other_src/Makefile.am	2008-06-30 02:59:56.000000000 +0200
-+++ rss-glx_0.8.2.p/other_src/Makefile.am	2008-12-16 15:42:54.000000000 +0100
-@@ -1,36 +1,21 @@
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
- AM_LDFLAGS=@GLEW@
- 
--bin_PROGRAMS = biof busyspheres matrixview spirographx sundancer2
-+bin_PROGRAMS = biof busyspheres spirographx sundancer2
- 
- biof_SOURCES = driver.c biof.c
- busyspheres_SOURCES = driver.c busyspheres.c
--matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
- spirographx_SOURCES = driver.c spirographx.c
- sundancer2_SOURCES = driver.c sundancer2.c
- 
- if INSTALL_XSCREENSAVER_CONFIG_FILES
--dist_config_DATA = biof.xml busyspheres.xml matrixview.xml spirographx.xml sundancer2.xml 
-+dist_config_DATA = biof.xml busyspheres.xml spirographx.xml sundancer2.xml 
- endif
- 
- if INSTALL_KDE_CONFIG_FILES
--dist_kdessconfig_DATA = biof.desktop busyspheres.desktop matrixview.desktop spirographx.desktop sundancer2.desktop
-+dist_kdessconfig_DATA = biof.desktop busyspheres.desktop spirographx.desktop sundancer2.desktop
- endif
- 
--man_MANS = biof.1 busyspheres.1 matrixview.1 spirographx.1 sundancer2.1
-+man_MANS = biof.1 busyspheres.1 spirographx.1 sundancer2.1
- 
- EXTRA_DIST = $(man_MANS)
--
--noinst_PROGRAMS = stringify
--stringify_LDADD = @BZIP2@
--
--matrixview_LDADD = @BZIP2@ @Wand_LIBS@
--matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
--	./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
--
--if WITHPTHREADS
--matrixview_LDADD += @PTHREADS@
--endif
--
--CLEANFILES = matrixview_textures.c
--
-diff -ur rss-glx_0.8.2/README rss-glx_0.8.2.p/README
---- rss-glx_0.8.2/README	2008-08-31 04:38:42.000000000 +0200
-+++ rss-glx_0.8.2.p/README	2008-12-16 15:43:14.000000000 +0100
-@@ -1,7 +1,5 @@
- Requirements: 
- 	(1) Recent gcc/g++ (2.95.x, 3.x).
- 	(2) X11+GLX.
--	(3) ImageMagick >6.2
- 	(4) OPTIONAL: OpenAL for sound. (skyrocket)
--	(5) OPTIONAL: pthreads for smoother image loading. (matrixview)
- 	(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
-diff -ur rss-glx_0.8.2/README.xscreensaver rss-glx_0.8.2.p/README.xscreensaver
---- rss-glx_0.8.2/README.xscreensaver	2005-04-10 04:16:42.000000000 +0200
-+++ rss-glx_0.8.2.p/README.xscreensaver	2008-12-16 15:43:32.000000000 +0100
-@@ -28,6 +28,5 @@
-   GL:                   "BioF"  biof --root                                 \n\
-   GL:            "BusySpheres"  busyspheres --root                          \n\
-   GL:            "SpirographX"  spirographx --root                          \n\
--  GL:             "MatrixView"  matrixview --root                           \n\
- -- End Here --
- 
-diff -ur rss-glx_0.8.2/utils/rss-glx_install.pl rss-glx_0.8.2.p/utils/rss-glx_install.pl
---- rss-glx_0.8.2/utils/rss-glx_install.pl	2005-04-10 04:09:41.000000000 +0200
-+++ rss-glx_0.8.2.p/utils/rss-glx_install.pl	2008-12-16 15:43:55.000000000 +0100
-@@ -26,7 +26,6 @@
- $screensavers->{'biof'} 	= '  GL:                   "BioF"  biof --root                                 \\n\\';
- $screensavers->{'busyspheres'} 	= '  GL:            "BusySpheres"  busyspheres --root                          \\n\\';
- $screensavers->{'spirographx'} 	= '  GL:            "SpirographX"  spirographx --root                          \\n\\';
--$screensavers->{'matrixview'} 	= '  GL:             "MatrixView"  matrixview --root                           \\n\\';
- 
- open XSCREENSAVER, "$ENV{'HOME'}/.xscreensaver";
- my @xscreensaver_config_file = <XSCREENSAVER>;
diff --git a/rss-glx-0.8.2.p-flags.patch b/rss-glx-0.8.2.p-flags.patch
deleted file mode 100644
index be1e98f..0000000
--- a/rss-glx-0.8.2.p-flags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up rss-glx_0.8.2.p/configure.in.flags rss-glx_0.8.2.p/configure.in
---- rss-glx_0.8.2.p/configure.in.flags	2008-12-16 15:51:05.000000000 +0100
-+++ rss-glx_0.8.2.p/configure.in	2008-12-16 16:06:51.000000000 +0100
-@@ -9,18 +9,26 @@ AC_PROG_AWK
- AC_PROG_CC
- AC_GNU_SOURCE
- 
--CFLAGS=-O2
- AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
-     [build with debugging information default=no])],
--    [test "$enableval" = "yes" && CFLAGS="-g"])
-+    [if test "$enableval" = "yes"; then
-+        : ${CFLAGS="-g"}
-+     else
-+        : ${CFLAGS="-O2"}
-+     fi
-+     ])
- CFLAGS="$CFLAGS -Wall"
- 
- AC_PROG_CXX
- 
--CXXFLAGS=-O2
- AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
-     [build with debugging information default=no])],
--    [test "$enableval" = "yes" && CXXFLAGS="-g"])
-+    [if test "$enableval" = "yes"; then
-+        : ${CXXFLAGS="-g"}
-+     else
-+        : ${CXXFLAGS="-O2"}
-+     fi
-+     ])
- CXXFLAGS="$CXXFLAGS -Wall"
- 
- AC_PROG_INSTALL
diff --git a/rss-glx-0.8.2.p-gcc43.patch b/rss-glx-0.8.2.p-gcc43.patch
deleted file mode 100644
index 0adecec..0000000
--- a/rss-glx-0.8.2.p-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp.gcc43 rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp
---- rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp.gcc43	2005-04-10 01:00:43.000000000 +0200
-+++ rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp	2008-12-16 16:09:40.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <AL/al.h>
- #include <AL/alut.h>
- 
-+#include <cstdlib>
- #include <list>
- 
- #include "loadTexture.h"
-diff -up rss-glx_0.8.2.p/reallyslick/Implicit/impSurface.cpp.gcc43 rss-glx_0.8.2.p/reallyslick/Implicit/impSurface.cpp
diff --git a/rss-glx-0.9.0-0.9.0.p.diff b/rss-glx-0.9.0-0.9.0.p.diff
new file mode 100644
index 0000000..b4ab959
--- /dev/null
+++ b/rss-glx-0.9.0-0.9.0.p.diff
@@ -0,0 +1,91 @@
+diff -urBNw rss-glx_0.9.0/ChangeLog rss-glx_0.9.0.p/ChangeLog
+--- rss-glx_0.9.0/ChangeLog	2009-05-17 01:03:38.000000000 +0200
++++ rss-glx_0.9.0.p/ChangeLog	2009-08-17 14:58:18.273168054 +0200
+@@ -1,3 +1,7 @@
++****************************** Version 0.9.0.p  ********************************
++	
++	Removed matrixview
++
+ ******************************* Version 0.9.0  *********************************
+ 
+ 	Added port of drempels, originally by Ryan M. Geiss,
+diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
+--- rss-glx_0.9.0/configure.in	2009-05-19 17:12:01.000000000 +0200
++++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:00:57.538167383 +0200
+@@ -1,6 +1,6 @@
+ # Process this file with autoconf to produce a configure script.
+ AC_INIT(src/driver.c)
+-AM_INIT_AUTOMAKE(rss-glx,0.9.0)
++AM_INIT_AUTOMAKE(rss-glx,0.9.0.p)
+ AM_CONFIG_HEADER(config.h)
+ 
+ # Checks for programs.
+diff -urBNw rss-glx_0.9.0/README rss-glx_0.9.0.p/README
+--- rss-glx_0.9.0/README	2008-08-31 04:38:42.000000000 +0200
++++ rss-glx_0.9.0.p/README	2009-08-17 15:04:45.620179698 +0200
+@@ -3,5 +3,4 @@
+ 	(2) X11+GLX.
+ 	(3) ImageMagick >6.2
+ 	(4) OPTIONAL: OpenAL for sound. (skyrocket)
+-	(5) OPTIONAL: pthreads for smoother image loading. (matrixview)
+ 	(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
+diff -urBNw rss-glx_0.9.0/README.xscreensaver rss-glx_0.9.0.p/README.xscreensaver
+--- rss-glx_0.9.0/README.xscreensaver	2009-04-13 20:30:58.000000000 +0200
++++ rss-glx_0.9.0.p/README.xscreensaver	2009-08-17 15:04:55.724168053 +0200
+@@ -28,7 +28,6 @@
+   GL:                   "BioF"  biof --root                                 \n\
+   GL:            "BusySpheres"  busyspheres --root                          \n\
+   GL:            "SpirographX"  spirographx --root                          \n\
+-  GL:             "MatrixView"  matrixview --root                           \n\
+   GL:                 "Lorenz"  lorenz --root                               \n\
+ -- End Here --
+ 
+diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
+--- rss-glx_0.9.0/src/Makefile.am	2009-05-19 02:13:52.000000000 +0200
++++ rss-glx_0.9.0.p/src/Makefile.am	2009-08-17 15:03:54.259165189 +0200
+@@ -3,7 +3,7 @@
+ INCLUDES = -I$(top_srcdir)/src
+ AM_LDFLAGS = @GLEW@
+ 
+-bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview plasma skyrocket solarwinds spirographx sundancer2
++bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz plasma skyrocket solarwinds spirographx sundancer2
+ 
+ biof_SOURCES = driver.c biof.c
+ busyspheres_SOURCES = driver.c busyspheres.c
+@@ -33,9 +33,6 @@
+ lattice_LDADD = @BZIP2@
+ lorenz_SOURCES = driver.c lorenz.cpp
+ lorenz_LDADD = -LrsMath -lrsMath
+-matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
+-matrixview_CFLAGS = @Wand_CFLAGS@
+-matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
+ plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
+ skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
+ solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
+@@ -73,9 +70,6 @@
+ lattice_textures.c: stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex
+ 	./stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex > lattice_textures.c
+ 
+-matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
+-	./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
+-
+ skyrocket_textures.cpp: stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5
+ 	./stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5 > skyrocket_textures.cpp
+ 
+@@ -113,4 +107,4 @@
+ skyrocket_LDADD = @BZIP2@ -LrsMath -lrsMath
+ endif
+ 
+-CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c matrixview_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
++CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
+diff -urBNw rss-glx_0.9.0/utils/rss-glx_install.pl rss-glx_0.9.0.p/utils/rss-glx_install.pl
+--- rss-glx_0.9.0/utils/rss-glx_install.pl	2009-05-19 16:36:29.000000000 +0200
++++ rss-glx_0.9.0.p/utils/rss-glx_install.pl	2009-08-17 15:05:08.531419223 +0200
+@@ -26,7 +26,6 @@
+ $screensavers->{'biof'} 	= '  GL:                   "BioF"  biof --root                                 \\n\\';
+ $screensavers->{'busyspheres'} 	= '  GL:            "BusySpheres"  busyspheres --root                          \\n\\';
+ $screensavers->{'spirographx'} 	= '  GL:            "SpirographX"  spirographx --root                          \\n\\';
+-$screensavers->{'matrixview'} 	= '  GL:             "MatrixView"  matrixview --root                           \\n\\';
+ $screensavers->{'lorenz'}	= '  GL:                 "Lorenz"  lorenz --root                               \\n\\';
+ $screensavers->{'drempels'}	= '  GL:               "Drempels"  drempels --root                             \\n\\';
+ $screensavers->{'feedback'}	= '  GL:               "Feedback"  feedback --root                             \\n\\';
diff --git a/rss-glx-0.9.0.p-optflags.patch b/rss-glx-0.9.0.p-optflags.patch
new file mode 100644
index 0000000..f7fe794
--- /dev/null
+++ b/rss-glx-0.9.0.p-optflags.patch
@@ -0,0 +1,32 @@
+diff -up rss-glx_0.9.0.p/configure.in.optflags rss-glx_0.9.0.p/configure.in
+--- rss-glx_0.9.0.p/configure.in.optflags	2009-08-17 15:28:29.717199402 +0200
++++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:32:02.830167905 +0200
+@@ -11,24 +11,28 @@ AM_PROG_CC_C_O
+ AC_PROG_CC_C99
+ AC_C_BIGENDIAN
+ 
++if test "x$CFLAGS" = x; then
+ if test "x$GCC" = xyes; then
+ 	CFLAGS="-O2"
+ fi
+ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
+     [build with debugging information default=no])],
+     [test "$enableval" = "yes" && CFLAGS="-g"])
++fi
+ if test "x$GCC" = xyes; then
+ 	CFLAGS="$CFLAGS -Wall"
+ fi
+ 
+ AC_PROG_CXX
+ 
++if test "x$CXXFLAGS" = x; then
+ if test "x$GXX" = xyes; then
+ 	CXXFLAGS="-O2"
+ fi
+ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
+     [build with debugging information default=no])],
+     [test "$enableval" = "yes" && CXXFLAGS="-g"])
++fi
+ if test "x$GXX" = xyes; then
+ 	CXXFLAGS="$CXXFLAGS -Wall"
+ fi
diff --git a/rss-glx-rm-matrixview.sh b/rss-glx-rm-matrixview.sh
index 82c0e09..e5c3ef8 100644
--- a/rss-glx-rm-matrixview.sh
+++ b/rss-glx-rm-matrixview.sh
@@ -3,7 +3,7 @@
 MV_FILES="matrixview.1 matrixview.c matrixview.desktop matrixview_textures matrixview_textures.h matrixview.xml"
 mv_files=
 for i in $MV_FILES; do
-    mv_files="$mv_files other_src/$i"
+    mv_files="$mv_files src/$i"
 done
 
 usage() {
diff --git a/rss-glx.spec b/rss-glx.spec
index 60b737a..373746e 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -43,26 +43,26 @@
 
 Summary: Really Slick Screensavers
 Name: rss-glx
-Version: 0.8.2%{patchext}
-Release: 3%{?dist}
+Version: 0.9.0%{patchext}
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
 # The original URL is the following without %%patchext:
-# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# Source0: http://downloads.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
 Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
+# The following two strip matrixview from the package and build a new tarball
 Source2: rss-glx-rm-matrixview.sh
-Source3: rss-glx-0.8.2-0.8.2.p.diff
-Patch0: rss-glx-0.8.2.p-flags.patch
-Patch1: rss-glx-0.8.2.p-gcc43.patch
+Source3: rss-glx-0.9.0-0.9.0.p.diff
+# https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
+Patch0: rss-glx-0.9.0.p-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %{with matrixview}
+BuildRequires: glew-devel
 BuildRequires: ImageMagick-devel >= 6.2.5.4
-%endif
 %if %{with modular_x}
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
@@ -175,15 +175,7 @@ Build settings:
 
 EOF
 %setup -q -n rss-glx_%{version}
-%patch0 -p1 -b .flags
-%patch1 -p1 -b .gcc43
-
-# work around BZ #189928
-for f in `find . -type l` ; do
-    cp -p ${f} ${f}_
-    unlink ${f}
-    mv ${f}_ $f
-done
+%patch0 -p1 -b .optflags
 
 %build
 autoreconf -i
@@ -263,19 +255,22 @@ BioF§biof§This is an attempt to recreate some of the work of William Latham.
 Busy Spheres§busyspheres§Spheres made of dancing particles.
 Colorfire§colorfire§Burning colors.
 Cyclone§cyclone§A cyclone made of particles.
+Drempels§drempels§A hallucinatory desktop enhancer.
 Euphoria§euphoria§Psychedelic shapes.
+Feedback§feedback§Stirring colors with a jiggling warp.
 Fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
-Flocks§flocks§Flocks of birds.
-Flux§flux§If you know anything about strange attractors, you might recognize the patterns created by this screensaver.
-Helios§helios§Throw together some attraction/repulsion particle effects and some smooth implicit surfaces and this is what you get.
-Hufo's Smoke§hufo_smoke§Smoke effect.
+Flocks§flocks§Floating wisps.
+Flux§flux§Flux fields and stuff.
+Helios§helios§Attraction/repulsion particle effects and some smooth surfaces.
+Hufo's Smoke§hufo_smoke§Particle smoke effect.
 Hufo's Tunnel§hufo_tunnel§Inside a tunnel.
-Hyperspace§hyperspace§Hyperspace.
+Hyperspace§hyperspace§Flying through hyper space.
 Lattice§lattice§Fly through an endless world of linked rings.
+Lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
 MatrixView§matrixview§The Matrix.
 %endif
-Plasma§plasma§Probably the second most psychedelic screensaver in existence.
+Plasma§plasma§Oozing plasma.
 Skyrocket (silent)§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
 Skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
 Solarwinds§solarwinds§This is a very mesmerizing particle effects saver.
@@ -300,8 +295,8 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc ChangeLog COPYING INSTALL README
-%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.2-0.8.2.p.diff
+%doc ChangeLog COPYING INSTALL
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.0-0.9.0.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
 
@@ -328,6 +323,14 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-1
+- version 0.9.0.p
+- build with GLEW
+- don't distribute README
+- replace flags by optflags patch
+- remove obsolete gcc-4.3 patch
+- remove symlinked source files workaround (#189928)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2.p-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index cf5fc5f..799fa04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5c04adbb538a6d74ce50ef091428021  rss-glx_0.8.2.p.tar.bz2
+95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2

From 7f3b6917a7bd557a9793771c2b5605adfafa0065 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 17 Aug 2009 15:46:46 +0000
Subject: [PATCH 11/96] don't rebuild autofoo files

---
 .cvsignore   |  1 +
 rss-glx.spec | 13 +++++--------
 sources      |  1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 92a4abf..b4ff5c8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 rss-glx_0.9.0.p.tar.bz2
+rss-glx-0.9.0-autofoo.patch.bz2
diff --git a/rss-glx.spec b/rss-glx.spec
index 373746e..ceeea03 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.0-0.9.0.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -76,13 +77,6 @@ BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
 
-## the following deps are needed for autoreconf after applying patches
-# no translations -> no gettext needed
-#BuildRequires: gettext
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
 impressive and graphically intensive screensavers.
@@ -176,9 +170,9 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .autofoo
 
 %build
-autoreconf -i
 %configure \
     --with-configdir=%{xssconfigdir} \
     --with-kdessconfigdir=%{kdessconfigdir} \
@@ -323,6 +317,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-2
+- don't rebuild autofoo files
+
 * Mon Aug 17 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-1
 - version 0.9.0.p
 - build with GLEW
diff --git a/sources b/sources
index 799fa04..5f6627d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2
+aaa6755b6ddc04a6597fac6ed1984339  rss-glx-0.9.0-autofoo.patch.bz2

From 3e429a2962a5b9f61e5e133a4c2133eaa05e8867 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 17 Aug 2009 15:47:30 +0000
Subject: [PATCH 12/96] bump release

---
 rss-glx.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index ceeea03..b84707b 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.0%{patchext}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/

From a23ad9d408509460d12bacb9da1779054a598b5d Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Tue, 18 Aug 2009 15:51:25 +0000
Subject: [PATCH 13/96] explain autofoo patch

---
 rss-glx.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rss-glx.spec b/rss-glx.spec
index b84707b..274b292 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.0-0.9.0.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+# don't run autoreconf when building
 Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
@@ -317,6 +318,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils@redhat.com>
+- explain autofoo patch
+
 * Mon Aug 17 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-2
 - don't rebuild autofoo files
 

From d51f5b0eb5cb2a0bc89d7c0303edea6cdcaee887 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Tue, 1 Sep 2009 13:25:48 +0000
Subject: [PATCH 14/96] don't ship prefixed rss-glx-rss-glx_install.pl

---
 rss-glx.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 274b292..5b7dc91 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.0%{patchext}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -238,7 +238,8 @@ EOF
 rm -rf %buildroot
 install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
 make DESTDIR=%{buildroot} install
-rm -f %{buildroot}%{_libdir}/lib*.{,l}a %{buildroot}%{_bindir}/rss-glx_install.pl
+rm -f %{buildroot}%{_libdir}/lib*.{,l}a
+rm %{buildroot}%{_bindir}/rss-glx-rss-glx_install.pl
 %if %{with gss}
 mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
@@ -318,6 +319,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Sep 01 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-3
+- don't ship prefixed rss-glx-rss-glx_install.pl
+
 * Tue Aug 18 2009 Nils Philippsen <nils@redhat.com>
 - explain autofoo patch
 

From 770792cfb73af4e4db150f7a4faa2d9c6e0517ef Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 06:44:12 +0000
Subject: [PATCH 15/96] Initialize branch F-12 for rss-glx

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12

From fa13658f1efe4b72099b976f30be67dc87e5df6f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 23:13:21 +0000
Subject: [PATCH 16/96] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6f98632..725a6d6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := rss-glx
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 49821848893246dc4d9ca4ef89600c99420097b9 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:29:47 +0000
Subject: [PATCH 17/96] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6f98632..725a6d6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := rss-glx
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 9ed58d0fd5067356d80c0008eb8123c96ddd6fa8 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 18 Jan 2010 12:11:52 +0000
Subject: [PATCH 18/96] version 0.9.1.p remove autofoo patch add BR:
 quesoglc-devel for new     pixelcity hack bump BR: ImageMagick-devel >= 6.4

---
 .cvsignore                                    |  3 +-
 ...0.9.0.p.diff => rss-glx-0.9.1-0.9.1.p.diff | 63 ++++++++-----------
 rss-glx.spec                                  | 21 ++++---
 sources                                       |  3 +-
 4 files changed, 42 insertions(+), 48 deletions(-)
 rename rss-glx-0.9.0-0.9.0.p.diff => rss-glx-0.9.1-0.9.1.p.diff (67%)

diff --git a/.cvsignore b/.cvsignore
index b4ff5c8..c5a00c1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-rss-glx_0.9.0.p.tar.bz2
-rss-glx-0.9.0-autofoo.patch.bz2
+rss-glx_0.9.1.p.tar.bz2
diff --git a/rss-glx-0.9.0-0.9.0.p.diff b/rss-glx-0.9.1-0.9.1.p.diff
similarity index 67%
rename from rss-glx-0.9.0-0.9.0.p.diff
rename to rss-glx-0.9.1-0.9.1.p.diff
index b4ab959..7985790 100644
--- a/rss-glx-0.9.0-0.9.0.p.diff
+++ b/rss-glx-0.9.1-0.9.1.p.diff
@@ -1,17 +1,17 @@
-diff -urBNw rss-glx_0.9.0/ChangeLog rss-glx_0.9.0.p/ChangeLog
---- rss-glx_0.9.0/ChangeLog	2009-05-17 01:03:38.000000000 +0200
-+++ rss-glx_0.9.0.p/ChangeLog	2009-08-17 14:58:18.273168054 +0200
+diff -urBNw rss-glx_0.9.1/ChangeLog rss-glx_0.9.1.p/ChangeLog
+--- rss-glx_0.9.1/ChangeLog	2010-01-05 03:57:27.000000000 +0100
++++ rss-glx_0.9.1.p/ChangeLog	2010-01-18 12:38:23.000000000 +0100
 @@ -1,3 +1,7 @@
-+****************************** Version 0.9.0.p  ********************************
-+	
++****************************** Version 0.9.1.p  ********************************
++
 +	Removed matrixview
 +
- ******************************* Version 0.9.0  *********************************
+ ******************************* Version 0.9.1  *********************************
  
- 	Added port of drempels, originally by Ryan M. Geiss,
-diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
---- rss-glx_0.9.0/configure.in	2009-05-19 17:12:01.000000000 +0200
-+++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:00:57.538167383 +0200
+ 	Added port of Pixel City, originally by Shamus Young,
+diff -urBNw rss-glx_0.9.1/configure.in rss-glx_0.9.1.p/configure.in
+--- rss-glx_0.9.1/configure.in	2010-01-05 03:59:13.000000000 +0100
++++ rss-glx_0.9.1.p/configure.in	2010-01-18 12:38:41.000000000 +0100
 @@ -1,6 +1,6 @@
  # Process this file with autoconf to produce a configure script.
  AC_INIT(src/driver.c)
@@ -20,35 +20,26 @@ diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
  AM_CONFIG_HEADER(config.h)
  
  # Checks for programs.
-diff -urBNw rss-glx_0.9.0/README rss-glx_0.9.0.p/README
---- rss-glx_0.9.0/README	2008-08-31 04:38:42.000000000 +0200
-+++ rss-glx_0.9.0.p/README	2009-08-17 15:04:45.620179698 +0200
-@@ -3,5 +3,4 @@
- 	(2) X11+GLX.
- 	(3) ImageMagick >6.2
- 	(4) OPTIONAL: OpenAL for sound. (skyrocket)
--	(5) OPTIONAL: pthreads for smoother image loading. (matrixview)
- 	(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
-diff -urBNw rss-glx_0.9.0/README.xscreensaver rss-glx_0.9.0.p/README.xscreensaver
---- rss-glx_0.9.0/README.xscreensaver	2009-04-13 20:30:58.000000000 +0200
-+++ rss-glx_0.9.0.p/README.xscreensaver	2009-08-17 15:04:55.724168053 +0200
+diff -urBNw rss-glx_0.9.1/README.xscreensaver rss-glx_0.9.1.p/README.xscreensaver
+--- rss-glx_0.9.1/README.xscreensaver	2010-01-05 03:38:14.000000000 +0100
++++ rss-glx_0.9.1.p/README.xscreensaver	2010-01-18 12:47:02.000000000 +0100
 @@ -28,7 +28,6 @@
    GL:                   "BioF"  biof --root                                 \n\
    GL:            "BusySpheres"  busyspheres --root                          \n\
    GL:            "SpirographX"  spirographx --root                          \n\
 -  GL:             "MatrixView"  matrixview --root                           \n\
    GL:                 "Lorenz"  lorenz --root                               \n\
- -- End Here --
- 
-diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
---- rss-glx_0.9.0/src/Makefile.am	2009-05-19 02:13:52.000000000 +0200
-+++ rss-glx_0.9.0.p/src/Makefile.am	2009-08-17 15:03:54.259165189 +0200
+   GL:               "Drempels"  drempels --root                             \n\
+   GL:               "Feedback"  feedback --root                             \n\
+diff -urBNw rss-glx_0.9.1/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
+--- rss-glx_0.9.1/src/Makefile.am	2010-01-04 01:44:04.000000000 +0100
++++ rss-glx_0.9.1.p/src/Makefile.am	2010-01-18 12:47:58.000000000 +0100
 @@ -3,7 +3,7 @@
  INCLUDES = -I$(top_srcdir)/src
  AM_LDFLAGS = @GLEW@
  
--bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview plasma skyrocket solarwinds spirographx sundancer2
-+bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz plasma skyrocket solarwinds spirographx sundancer2
+-bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview pixelcity plasma skyrocket solarwinds spirographx sundancer2
++bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz pixelcity plasma skyrocket solarwinds spirographx sundancer2
  
  biof_SOURCES = driver.c biof.c
  busyspheres_SOURCES = driver.c busyspheres.c
@@ -60,9 +51,9 @@ diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
 -matrixview_CFLAGS = @Wand_CFLAGS@
 -matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
  plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
- skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
- solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
-@@ -73,9 +70,6 @@
+ pixelcity_SOURCES = driver.c
+ pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
+@@ -75,9 +72,6 @@
  lattice_textures.c: stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex
  	./stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex > lattice_textures.c
  
@@ -72,15 +63,15 @@ diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
  skyrocket_textures.cpp: stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5
  	./stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5 > skyrocket_textures.cpp
  
-@@ -113,4 +107,4 @@
+@@ -115,4 +109,4 @@
  skyrocket_LDADD = @BZIP2@ -LrsMath -lrsMath
  endif
  
 -CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c matrixview_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
 +CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
-diff -urBNw rss-glx_0.9.0/utils/rss-glx_install.pl rss-glx_0.9.0.p/utils/rss-glx_install.pl
---- rss-glx_0.9.0/utils/rss-glx_install.pl	2009-05-19 16:36:29.000000000 +0200
-+++ rss-glx_0.9.0.p/utils/rss-glx_install.pl	2009-08-17 15:05:08.531419223 +0200
+diff -urBNw rss-glx_0.9.1/utils/rss-glx_install.pl rss-glx_0.9.1.p/utils/rss-glx_install.pl
+--- rss-glx_0.9.1/utils/rss-glx_install.pl	2010-01-05 03:38:40.000000000 +0100
++++ rss-glx_0.9.1.p/utils/rss-glx_install.pl	2010-01-18 12:48:17.000000000 +0100
 @@ -26,7 +26,6 @@
  $screensavers->{'biof'} 	= '  GL:                   "BioF"  biof --root                                 \\n\\';
  $screensavers->{'busyspheres'} 	= '  GL:            "BusySpheres"  busyspheres --root                          \\n\\';
diff --git a/rss-glx.spec b/rss-glx.spec
index 5b7dc91..6e8f153 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -43,8 +43,8 @@
 
 Summary: Really Slick Screensavers
 Name: rss-glx
-Version: 0.9.0%{patchext}
-Release: 3%{?dist}
+Version: 0.9.1%{patchext}
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -55,16 +55,15 @@ Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
 # The following two strip matrixview from the package and build a new tarball
 Source2: rss-glx-rm-matrixview.sh
-Source3: rss-glx-0.9.0-0.9.0.p.diff
+Source3: rss-glx-0.9.1-0.9.1.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
-# don't run autoreconf when building
-Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
 BuildRequires: glew-devel
-BuildRequires: ImageMagick-devel >= 6.2.5.4
+BuildRequires: quesoglc-devel
+BuildRequires: ImageMagick-devel >= 6.4
 %if %{with modular_x}
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
@@ -171,7 +170,6 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .autofoo
 
 %build
 %configure \
@@ -266,6 +264,7 @@ Lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
 MatrixView§matrixview§The Matrix.
 %endif
+Pixel City§pixelcity§Procedural city fly through.
 Plasma§plasma§Oozing plasma.
 Skyrocket (silent)§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
 Skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
@@ -292,7 +291,7 @@ fi
 %files
 %defattr(-, root, root)
 %doc ChangeLog COPYING INSTALL
-%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.0-0.9.0.p.diff
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.1-0.9.1.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
 
@@ -319,6 +318,12 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Sep 01 2009 Nils Philippsen <nils@redhat.com> 0.9.1.p-1
+- version 0.9.1.p
+- remove autofoo patch
+- add BR: quesoglc-devel for new pixelcity hack
+- bump BR: ImageMagick-devel >= 6.4
+
 * Tue Sep 01 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-3
 - don't ship prefixed rss-glx-rss-glx_install.pl
 
diff --git a/sources b/sources
index 5f6627d..0477243 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2
-aaa6755b6ddc04a6597fac6ed1984339  rss-glx-0.9.0-autofoo.patch.bz2
+bc420d230634fe8d3bbc79dc6a3c6678  rss-glx_0.9.1.p.tar.bz2

From aa8206a7bcd5629b192dfb5a5e74a763e82ee83e Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 18 Jan 2010 12:20:03 +0000
Subject: [PATCH 19/96] version 0.9.1.p remove autofoo patch add BR:
 quesoglc-devel for new     pixelcity hack bump BR: ImageMagick-devel >= 6.4

---
 .cvsignore                                    |  3 +-
 ...0.9.0.p.diff => rss-glx-0.9.1-0.9.1.p.diff | 63 ++++++++-----------
 rss-glx.spec                                  | 21 ++++---
 sources                                       |  3 +-
 4 files changed, 42 insertions(+), 48 deletions(-)
 rename rss-glx-0.9.0-0.9.0.p.diff => rss-glx-0.9.1-0.9.1.p.diff (67%)

diff --git a/.cvsignore b/.cvsignore
index b4ff5c8..c5a00c1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-rss-glx_0.9.0.p.tar.bz2
-rss-glx-0.9.0-autofoo.patch.bz2
+rss-glx_0.9.1.p.tar.bz2
diff --git a/rss-glx-0.9.0-0.9.0.p.diff b/rss-glx-0.9.1-0.9.1.p.diff
similarity index 67%
rename from rss-glx-0.9.0-0.9.0.p.diff
rename to rss-glx-0.9.1-0.9.1.p.diff
index b4ab959..7985790 100644
--- a/rss-glx-0.9.0-0.9.0.p.diff
+++ b/rss-glx-0.9.1-0.9.1.p.diff
@@ -1,17 +1,17 @@
-diff -urBNw rss-glx_0.9.0/ChangeLog rss-glx_0.9.0.p/ChangeLog
---- rss-glx_0.9.0/ChangeLog	2009-05-17 01:03:38.000000000 +0200
-+++ rss-glx_0.9.0.p/ChangeLog	2009-08-17 14:58:18.273168054 +0200
+diff -urBNw rss-glx_0.9.1/ChangeLog rss-glx_0.9.1.p/ChangeLog
+--- rss-glx_0.9.1/ChangeLog	2010-01-05 03:57:27.000000000 +0100
++++ rss-glx_0.9.1.p/ChangeLog	2010-01-18 12:38:23.000000000 +0100
 @@ -1,3 +1,7 @@
-+****************************** Version 0.9.0.p  ********************************
-+	
++****************************** Version 0.9.1.p  ********************************
++
 +	Removed matrixview
 +
- ******************************* Version 0.9.0  *********************************
+ ******************************* Version 0.9.1  *********************************
  
- 	Added port of drempels, originally by Ryan M. Geiss,
-diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
---- rss-glx_0.9.0/configure.in	2009-05-19 17:12:01.000000000 +0200
-+++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:00:57.538167383 +0200
+ 	Added port of Pixel City, originally by Shamus Young,
+diff -urBNw rss-glx_0.9.1/configure.in rss-glx_0.9.1.p/configure.in
+--- rss-glx_0.9.1/configure.in	2010-01-05 03:59:13.000000000 +0100
++++ rss-glx_0.9.1.p/configure.in	2010-01-18 12:38:41.000000000 +0100
 @@ -1,6 +1,6 @@
  # Process this file with autoconf to produce a configure script.
  AC_INIT(src/driver.c)
@@ -20,35 +20,26 @@ diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
  AM_CONFIG_HEADER(config.h)
  
  # Checks for programs.
-diff -urBNw rss-glx_0.9.0/README rss-glx_0.9.0.p/README
---- rss-glx_0.9.0/README	2008-08-31 04:38:42.000000000 +0200
-+++ rss-glx_0.9.0.p/README	2009-08-17 15:04:45.620179698 +0200
-@@ -3,5 +3,4 @@
- 	(2) X11+GLX.
- 	(3) ImageMagick >6.2
- 	(4) OPTIONAL: OpenAL for sound. (skyrocket)
--	(5) OPTIONAL: pthreads for smoother image loading. (matrixview)
- 	(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
-diff -urBNw rss-glx_0.9.0/README.xscreensaver rss-glx_0.9.0.p/README.xscreensaver
---- rss-glx_0.9.0/README.xscreensaver	2009-04-13 20:30:58.000000000 +0200
-+++ rss-glx_0.9.0.p/README.xscreensaver	2009-08-17 15:04:55.724168053 +0200
+diff -urBNw rss-glx_0.9.1/README.xscreensaver rss-glx_0.9.1.p/README.xscreensaver
+--- rss-glx_0.9.1/README.xscreensaver	2010-01-05 03:38:14.000000000 +0100
++++ rss-glx_0.9.1.p/README.xscreensaver	2010-01-18 12:47:02.000000000 +0100
 @@ -28,7 +28,6 @@
    GL:                   "BioF"  biof --root                                 \n\
    GL:            "BusySpheres"  busyspheres --root                          \n\
    GL:            "SpirographX"  spirographx --root                          \n\
 -  GL:             "MatrixView"  matrixview --root                           \n\
    GL:                 "Lorenz"  lorenz --root                               \n\
- -- End Here --
- 
-diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
---- rss-glx_0.9.0/src/Makefile.am	2009-05-19 02:13:52.000000000 +0200
-+++ rss-glx_0.9.0.p/src/Makefile.am	2009-08-17 15:03:54.259165189 +0200
+   GL:               "Drempels"  drempels --root                             \n\
+   GL:               "Feedback"  feedback --root                             \n\
+diff -urBNw rss-glx_0.9.1/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
+--- rss-glx_0.9.1/src/Makefile.am	2010-01-04 01:44:04.000000000 +0100
++++ rss-glx_0.9.1.p/src/Makefile.am	2010-01-18 12:47:58.000000000 +0100
 @@ -3,7 +3,7 @@
  INCLUDES = -I$(top_srcdir)/src
  AM_LDFLAGS = @GLEW@
  
--bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview plasma skyrocket solarwinds spirographx sundancer2
-+bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz plasma skyrocket solarwinds spirographx sundancer2
+-bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview pixelcity plasma skyrocket solarwinds spirographx sundancer2
++bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz pixelcity plasma skyrocket solarwinds spirographx sundancer2
  
  biof_SOURCES = driver.c biof.c
  busyspheres_SOURCES = driver.c busyspheres.c
@@ -60,9 +51,9 @@ diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
 -matrixview_CFLAGS = @Wand_CFLAGS@
 -matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
  plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
- skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
- solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
-@@ -73,9 +70,6 @@
+ pixelcity_SOURCES = driver.c
+ pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
+@@ -75,9 +72,6 @@
  lattice_textures.c: stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex
  	./stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex > lattice_textures.c
  
@@ -72,15 +63,15 @@ diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
  skyrocket_textures.cpp: stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5
  	./stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5 > skyrocket_textures.cpp
  
-@@ -113,4 +107,4 @@
+@@ -115,4 +109,4 @@
  skyrocket_LDADD = @BZIP2@ -LrsMath -lrsMath
  endif
  
 -CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c matrixview_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
 +CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
-diff -urBNw rss-glx_0.9.0/utils/rss-glx_install.pl rss-glx_0.9.0.p/utils/rss-glx_install.pl
---- rss-glx_0.9.0/utils/rss-glx_install.pl	2009-05-19 16:36:29.000000000 +0200
-+++ rss-glx_0.9.0.p/utils/rss-glx_install.pl	2009-08-17 15:05:08.531419223 +0200
+diff -urBNw rss-glx_0.9.1/utils/rss-glx_install.pl rss-glx_0.9.1.p/utils/rss-glx_install.pl
+--- rss-glx_0.9.1/utils/rss-glx_install.pl	2010-01-05 03:38:40.000000000 +0100
++++ rss-glx_0.9.1.p/utils/rss-glx_install.pl	2010-01-18 12:48:17.000000000 +0100
 @@ -26,7 +26,6 @@
  $screensavers->{'biof'} 	= '  GL:                   "BioF"  biof --root                                 \\n\\';
  $screensavers->{'busyspheres'} 	= '  GL:            "BusySpheres"  busyspheres --root                          \\n\\';
diff --git a/rss-glx.spec b/rss-glx.spec
index 5b7dc91..6e8f153 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -43,8 +43,8 @@
 
 Summary: Really Slick Screensavers
 Name: rss-glx
-Version: 0.9.0%{patchext}
-Release: 3%{?dist}
+Version: 0.9.1%{patchext}
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -55,16 +55,15 @@ Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
 # The following two strip matrixview from the package and build a new tarball
 Source2: rss-glx-rm-matrixview.sh
-Source3: rss-glx-0.9.0-0.9.0.p.diff
+Source3: rss-glx-0.9.1-0.9.1.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
-# don't run autoreconf when building
-Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
 BuildRequires: glew-devel
-BuildRequires: ImageMagick-devel >= 6.2.5.4
+BuildRequires: quesoglc-devel
+BuildRequires: ImageMagick-devel >= 6.4
 %if %{with modular_x}
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
@@ -171,7 +170,6 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .autofoo
 
 %build
 %configure \
@@ -266,6 +264,7 @@ Lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
 MatrixView§matrixview§The Matrix.
 %endif
+Pixel City§pixelcity§Procedural city fly through.
 Plasma§plasma§Oozing plasma.
 Skyrocket (silent)§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
 Skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
@@ -292,7 +291,7 @@ fi
 %files
 %defattr(-, root, root)
 %doc ChangeLog COPYING INSTALL
-%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.0-0.9.0.p.diff
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.1-0.9.1.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
 
@@ -319,6 +318,12 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Sep 01 2009 Nils Philippsen <nils@redhat.com> 0.9.1.p-1
+- version 0.9.1.p
+- remove autofoo patch
+- add BR: quesoglc-devel for new pixelcity hack
+- bump BR: ImageMagick-devel >= 6.4
+
 * Tue Sep 01 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-3
 - don't ship prefixed rss-glx-rss-glx_install.pl
 
diff --git a/sources b/sources
index 5f6627d..0477243 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2
-aaa6755b6ddc04a6597fac6ed1984339  rss-glx-0.9.0-autofoo.patch.bz2
+bc420d230634fe8d3bbc79dc6a3c6678  rss-glx_0.9.1.p.tar.bz2

From c064396ca9b012a596dc4906f6f19cdfbedfdb93 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Tue, 26 Jan 2010 15:24:04 +0000
Subject: [PATCH 20/96] add autoreconf patch, the optflags patch isn't worth
 much without it     (#558561) fix changelog date

---
 rss-glx-0.9.1.p-autoreconf.patch | 177 +++++++++++++++++++++++++++++++
 rss-glx.spec                     |  10 +-
 2 files changed, 185 insertions(+), 2 deletions(-)
 create mode 100644 rss-glx-0.9.1.p-autoreconf.patch

diff --git a/rss-glx-0.9.1.p-autoreconf.patch b/rss-glx-0.9.1.p-autoreconf.patch
new file mode 100644
index 0000000..591269e
--- /dev/null
+++ b/rss-glx-0.9.1.p-autoreconf.patch
@@ -0,0 +1,177 @@
+diff -up rss-glx_0.9.1.p/configure.autoreconf rss-glx_0.9.1.p/configure
+--- rss-glx_0.9.1.p/configure.autoreconf	2010-01-18 12:52:02.000000000 +0100
++++ rss-glx_0.9.1.p/configure	2010-01-26 16:19:16.475525018 +0100
+@@ -5362,6 +5362,7 @@ $as_echo "$as_me: error: unknown endiann
+  esac
+ 
+ 
++if test "x$CFLAGS" = x; then
+ if test "x$GCC" = xyes; then
+ 	CFLAGS="-O2"
+ fi
+@@ -5370,6 +5371,7 @@ if test "${enable_debug+set}" = set; the
+   enableval=$enable_debug; test "$enableval" = "yes" && CFLAGS="-g"
+ fi
+ 
++fi
+ if test "x$GCC" = xyes; then
+ 	CFLAGS="$CFLAGS -Wall"
+ fi
+@@ -5874,6 +5876,7 @@ fi
+ 
+ 
+ 
++if test "x$CXXFLAGS" = x; then
+ if test "x$GXX" = xyes; then
+ 	CXXFLAGS="-O2"
+ fi
+@@ -5882,6 +5885,7 @@ if test "${enable_debug+set}" = set; the
+   enableval=$enable_debug; test "$enableval" = "yes" && CXXFLAGS="-g"
+ fi
+ 
++fi
+ if test "x$GXX" = xyes; then
+ 	CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+@@ -6578,13 +6582,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:6581: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6585: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:6584: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6588: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:6587: output\"" >&5)
++  (eval echo "\"\$as_me:6591: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -7789,7 +7793,7 @@ ia64-*-hpux*)
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7792 "configure"' > conftest.$ac_ext
++  echo '#line 7796 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -9862,11 +9866,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9869: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9869: \$? = $ac_status" >&5
++   echo "$as_me:9873: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -10201,11 +10205,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10204: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10208: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10208: \$? = $ac_status" >&5
++   echo "$as_me:10212: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -10306,11 +10310,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10309: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:10313: \$? = $ac_status" >&5
++   echo "$as_me:10317: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10361,11 +10365,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10364: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10368: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:10368: \$? = $ac_status" >&5
++   echo "$as_me:10372: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -13164,7 +13168,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 13167 "configure"
++#line 13171 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13260,7 +13264,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 13263 "configure"
++#line 13267 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -15280,11 +15284,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15283: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15287: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15287: \$? = $ac_status" >&5
++   echo "$as_me:15291: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -15379,11 +15383,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15386: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15386: \$? = $ac_status" >&5
++   echo "$as_me:15390: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15431,11 +15435,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15434: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15438: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15438: \$? = $ac_status" >&5
++   echo "$as_me:15442: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
diff --git a/rss-glx.spec b/rss-glx.spec
index 6e8f153..41dbf5d 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.1-0.9.1.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+Patch1: rss-glx-0.9.1.p-autoreconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -170,6 +171,7 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .autoreconf
 
 %build
 %configure \
@@ -318,7 +320,11 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
-* Tue Sep 01 2009 Nils Philippsen <nils@redhat.com> 0.9.1.p-1
+* Tue Jan 26 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-2
+- add autoreconf patch, the optflags patch isn't worth much without it
+  (#558561)
+
+* Mon Jan 18 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-1
 - version 0.9.1.p
 - remove autofoo patch
 - add BR: quesoglc-devel for new pixelcity hack

From bd410aa91c2bcb5012f8b74f7f8a5d3c4365c364 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Tue, 26 Jan 2010 15:56:20 +0000
Subject: [PATCH 21/96] add autoreconf patch, the optflags patch isn't worth
 much without it     (#558561) fix changelog date

---
 rss-glx-0.9.1.p-autoreconf.patch | 177 +++++++++++++++++++++++++++++++
 rss-glx.spec                     |  10 +-
 2 files changed, 185 insertions(+), 2 deletions(-)
 create mode 100644 rss-glx-0.9.1.p-autoreconf.patch

diff --git a/rss-glx-0.9.1.p-autoreconf.patch b/rss-glx-0.9.1.p-autoreconf.patch
new file mode 100644
index 0000000..591269e
--- /dev/null
+++ b/rss-glx-0.9.1.p-autoreconf.patch
@@ -0,0 +1,177 @@
+diff -up rss-glx_0.9.1.p/configure.autoreconf rss-glx_0.9.1.p/configure
+--- rss-glx_0.9.1.p/configure.autoreconf	2010-01-18 12:52:02.000000000 +0100
++++ rss-glx_0.9.1.p/configure	2010-01-26 16:19:16.475525018 +0100
+@@ -5362,6 +5362,7 @@ $as_echo "$as_me: error: unknown endiann
+  esac
+ 
+ 
++if test "x$CFLAGS" = x; then
+ if test "x$GCC" = xyes; then
+ 	CFLAGS="-O2"
+ fi
+@@ -5370,6 +5371,7 @@ if test "${enable_debug+set}" = set; the
+   enableval=$enable_debug; test "$enableval" = "yes" && CFLAGS="-g"
+ fi
+ 
++fi
+ if test "x$GCC" = xyes; then
+ 	CFLAGS="$CFLAGS -Wall"
+ fi
+@@ -5874,6 +5876,7 @@ fi
+ 
+ 
+ 
++if test "x$CXXFLAGS" = x; then
+ if test "x$GXX" = xyes; then
+ 	CXXFLAGS="-O2"
+ fi
+@@ -5882,6 +5885,7 @@ if test "${enable_debug+set}" = set; the
+   enableval=$enable_debug; test "$enableval" = "yes" && CXXFLAGS="-g"
+ fi
+ 
++fi
+ if test "x$GXX" = xyes; then
+ 	CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+@@ -6578,13 +6582,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:6581: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6585: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:6584: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6588: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:6587: output\"" >&5)
++  (eval echo "\"\$as_me:6591: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -7789,7 +7793,7 @@ ia64-*-hpux*)
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7792 "configure"' > conftest.$ac_ext
++  echo '#line 7796 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -9862,11 +9866,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9869: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9869: \$? = $ac_status" >&5
++   echo "$as_me:9873: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -10201,11 +10205,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10204: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10208: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10208: \$? = $ac_status" >&5
++   echo "$as_me:10212: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -10306,11 +10310,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10309: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:10313: \$? = $ac_status" >&5
++   echo "$as_me:10317: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10361,11 +10365,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10364: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10368: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:10368: \$? = $ac_status" >&5
++   echo "$as_me:10372: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -13164,7 +13168,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 13167 "configure"
++#line 13171 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13260,7 +13264,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 13263 "configure"
++#line 13267 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -15280,11 +15284,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15283: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15287: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15287: \$? = $ac_status" >&5
++   echo "$as_me:15291: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -15379,11 +15383,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15386: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15386: \$? = $ac_status" >&5
++   echo "$as_me:15390: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15431,11 +15435,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15434: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15438: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15438: \$? = $ac_status" >&5
++   echo "$as_me:15442: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
diff --git a/rss-glx.spec b/rss-glx.spec
index 6e8f153..41dbf5d 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.1-0.9.1.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+Patch1: rss-glx-0.9.1.p-autoreconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -170,6 +171,7 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .autoreconf
 
 %build
 %configure \
@@ -318,7 +320,11 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
-* Tue Sep 01 2009 Nils Philippsen <nils@redhat.com> 0.9.1.p-1
+* Tue Jan 26 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-2
+- add autoreconf patch, the optflags patch isn't worth much without it
+  (#558561)
+
+* Mon Jan 18 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-1
 - version 0.9.1.p
 - remove autofoo patch
 - add BR: quesoglc-devel for new pixelcity hack

From 31a042c574d080846e2185a1fc59c2f738a8663e Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 17 Feb 2010 03:04:44 +0000
Subject: [PATCH 22/96] Initialize branch F-13 for rss-glx

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..baa94ef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-13

From 4ecb577c4dbf72c9b65ad25aa1cf3ffb50631a11 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Sun, 11 Apr 2010 17:34:51 +0000
Subject: [PATCH 23/96] Resolves: rhbz#564845 Fix ImplicitDSOLinking

---
 rss-glx-0.9.1.p-linker.patch | 31 +++++++++++++++++++++++++++++++
 rss-glx.spec                 |  7 ++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 rss-glx-0.9.1.p-linker.patch

diff --git a/rss-glx-0.9.1.p-linker.patch b/rss-glx-0.9.1.p-linker.patch
new file mode 100644
index 0000000..d195d98
--- /dev/null
+++ b/rss-glx-0.9.1.p-linker.patch
@@ -0,0 +1,31 @@
+diff -ru rss-glx_0.9.1.p.orig/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
+--- rss-glx_0.9.1.p.orig/src/Makefile.am	2010-04-11 14:03:33.000000000 +0100
++++ rss-glx_0.9.1.p/src/Makefile.am	2010-04-11 18:29:45.000000000 +0100
+@@ -36,6 +36,7 @@
+ plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
+ pixelcity_SOURCES = driver.c
+ pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
++pixelcity_LINK = $(CXXLINK)
+ skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
+ solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
+ spirographx_SOURCES = driver.c spirographx.c
+diff -ru rss-glx_0.9.1.p.orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in
+--- rss-glx_0.9.1.p.orig/src/Makefile.in	2010-04-11 14:03:33.000000000 +0100
++++ rss-glx_0.9.1.p/src/Makefile.in	2010-04-11 18:29:52.000000000 +0100
+@@ -446,6 +446,7 @@
+ plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
+ pixelcity_SOURCES = driver.c
+ pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
++pixelcity_LINK = $(CXXLINK)
+ skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
+ solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
+ spirographx_SOURCES = driver.c spirographx.c
+@@ -599,7 +600,7 @@
+ 	$(CXXLINK) $(lorenz_OBJECTS) $(lorenz_LDADD) $(LIBS)
+ pixelcity$(EXEEXT): $(pixelcity_OBJECTS) $(pixelcity_DEPENDENCIES) 
+ 	@rm -f pixelcity$(EXEEXT)
+-	$(LINK) $(pixelcity_OBJECTS) $(pixelcity_LDADD) $(LIBS)
++	$(pixelcity_LINK) $(pixelcity_OBJECTS) $(pixelcity_LDADD) $(LIBS)
+ plasma$(EXEEXT): $(plasma_OBJECTS) $(plasma_DEPENDENCIES) 
+ 	@rm -f plasma$(EXEEXT)
+ 	$(CXXLINK) $(plasma_OBJECTS) $(plasma_LDADD) $(LIBS)
diff --git a/rss-glx.spec b/rss-glx.spec
index 41dbf5d..4d01e59 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -59,6 +59,7 @@ Source3: rss-glx-0.9.1-0.9.1.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
 Patch1: rss-glx-0.9.1.p-autoreconf.patch
+Patch2: rss-glx-0.9.1.p-linker.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -172,6 +173,7 @@ EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .autoreconf
+%patch2 -p1 -b .linker
 
 %build
 %configure \
@@ -320,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sun Apr 11 2010 Caolán McNamara <caolanm@redhat.com> 0.9.1.p-3
+- Resolves: rhbz#564845 Fix ImplicitDSOLinking
+
 * Tue Jan 26 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-2
 - add autoreconf patch, the optflags patch isn't worth much without it
   (#558561)

From 238833db9944ec7e76324299083a88d092708612 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 11:41:08 +0000
Subject: [PATCH 24/96] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 725a6d6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rss-glx
-# $Id$
-NAME := rss-glx
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index baa94ef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-13

From 14f841d322f9333a1615a21937286692c03646bf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 11:41:10 +0000
Subject: [PATCH 25/96] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 725a6d6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rss-glx
-# $Id$
-NAME := rss-glx
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 06de2d2..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-12

From 689fe6ec7563a80011325e527225e022fd9c66e3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 11:41:13 +0000
Subject: [PATCH 26/96] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 725a6d6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rss-glx
-# $Id$
-NAME := rss-glx
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From 1a14d2a23ca5872d323ee62ab19148bfdf1a91e1 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 15 Sep 2010 14:53:41 +0200
Subject: [PATCH 27/96] add old tarballs

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index c5a00c1..41d8299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+rss-glx_0.8.1.p.tar.bz2
+rss-glx_0.8.2.p.tar.bz2
+rss-glx_0.9.0.p.tar.bz2
 rss-glx_0.9.1.p.tar.bz2

From 2d22d365bbd01e6904043b9e15d50973fd5944e7 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 15 Sep 2010 14:57:17 +0200
Subject: [PATCH 28/96] rebuild for new ImageMagick

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 4d01e59..25deaf7 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Wed Sep 15 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-4
+- rebuild for new ImageMagick
+
 * Sun Apr 11 2010 Caolán McNamara <caolanm@redhat.com> 0.9.1.p-3
 - Resolves: rhbz#564845 Fix ImplicitDSOLinking
 

From de1d76e538645408d5a5be954f43d588d0c127d3 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Wed, 29 Sep 2010 15:15:31 -0700
Subject: [PATCH 29/96] - Rebuilt for gcc bug 634757

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 25deaf7..4461257 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Wed Sep 29 2010 jkeating - 0.9.1.p-5
+- Rebuilt for gcc bug 634757
+
 * Wed Sep 15 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-4
 - rebuild for new ImageMagick
 

From 4fb7c6b435881852a9e6da88ed31802ef42e33c6 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Tue, 5 Oct 2010 15:37:38 -0700
Subject: [PATCH 30/96] - Rebuilt for gcc bug 634757

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 25deaf7..7cf6ece 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Oct 05 2010 jkeating - 0.9.1.p-4.1
+- Rebuilt for gcc bug 634757
+
 * Wed Sep 15 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-4
 - rebuild for new ImageMagick
 

From bbe682839b5db7c1c7c469b4e08972a22f460f11 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Mon, 11 Oct 2010 15:24:29 +0200
Subject: [PATCH 31/96] fix silent skyrocket desktop filename (#617531)

---
 .gitignore                       |   1 +
 rss-glx-0.9.1.p-autoreconf.patch | 177 -------------------------------
 rss-glx-0.9.1.p-linker.patch     |  20 ----
 rss-glx.spec                     |  65 ++++++------
 sources                          |   1 +
 5 files changed, 36 insertions(+), 228 deletions(-)
 delete mode 100644 rss-glx-0.9.1.p-autoreconf.patch

diff --git a/.gitignore b/.gitignore
index 41d8299..34d7f57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ rss-glx_0.8.1.p.tar.bz2
 rss-glx_0.8.2.p.tar.bz2
 rss-glx_0.9.0.p.tar.bz2
 rss-glx_0.9.1.p.tar.bz2
+/rss-glx-0.9.1.p-6-autoreconf.patch.bz2
diff --git a/rss-glx-0.9.1.p-autoreconf.patch b/rss-glx-0.9.1.p-autoreconf.patch
deleted file mode 100644
index 591269e..0000000
--- a/rss-glx-0.9.1.p-autoreconf.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -up rss-glx_0.9.1.p/configure.autoreconf rss-glx_0.9.1.p/configure
---- rss-glx_0.9.1.p/configure.autoreconf	2010-01-18 12:52:02.000000000 +0100
-+++ rss-glx_0.9.1.p/configure	2010-01-26 16:19:16.475525018 +0100
-@@ -5362,6 +5362,7 @@ $as_echo "$as_me: error: unknown endiann
-  esac
- 
- 
-+if test "x$CFLAGS" = x; then
- if test "x$GCC" = xyes; then
- 	CFLAGS="-O2"
- fi
-@@ -5370,6 +5371,7 @@ if test "${enable_debug+set}" = set; the
-   enableval=$enable_debug; test "$enableval" = "yes" && CFLAGS="-g"
- fi
- 
-+fi
- if test "x$GCC" = xyes; then
- 	CFLAGS="$CFLAGS -Wall"
- fi
-@@ -5874,6 +5876,7 @@ fi
- 
- 
- 
-+if test "x$CXXFLAGS" = x; then
- if test "x$GXX" = xyes; then
- 	CXXFLAGS="-O2"
- fi
-@@ -5882,6 +5885,7 @@ if test "${enable_debug+set}" = set; the
-   enableval=$enable_debug; test "$enableval" = "yes" && CXXFLAGS="-g"
- fi
- 
-+fi
- if test "x$GXX" = xyes; then
- 	CXXFLAGS="$CXXFLAGS -Wall"
- fi
-@@ -6578,13 +6582,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:6581: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6585: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6584: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6588: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6587: output\"" >&5)
-+  (eval echo "\"\$as_me:6591: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -7789,7 +7793,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 7792 "configure"' > conftest.$ac_ext
-+  echo '#line 7796 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -9862,11 +9866,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9869: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9869: \$? = $ac_status" >&5
-+   echo "$as_me:9873: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10201,11 +10205,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10204: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10208: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:10208: \$? = $ac_status" >&5
-+   echo "$as_me:10212: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10306,11 +10310,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10309: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10313: \$? = $ac_status" >&5
-+   echo "$as_me:10317: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10361,11 +10365,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10364: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10368: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10368: \$? = $ac_status" >&5
-+   echo "$as_me:10372: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -13164,7 +13168,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 13167 "configure"
-+#line 13171 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -13260,7 +13264,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 13263 "configure"
-+#line 13267 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15280,11 +15284,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15283: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15287: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15287: \$? = $ac_status" >&5
-+   echo "$as_me:15291: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -15379,11 +15383,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15386: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:15386: \$? = $ac_status" >&5
-+   echo "$as_me:15390: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -15431,11 +15435,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15434: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15438: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:15438: \$? = $ac_status" >&5
-+   echo "$as_me:15442: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
diff --git a/rss-glx-0.9.1.p-linker.patch b/rss-glx-0.9.1.p-linker.patch
index d195d98..ac03384 100644
--- a/rss-glx-0.9.1.p-linker.patch
+++ b/rss-glx-0.9.1.p-linker.patch
@@ -9,23 +9,3 @@ diff -ru rss-glx_0.9.1.p.orig/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
  skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
  solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
  spirographx_SOURCES = driver.c spirographx.c
-diff -ru rss-glx_0.9.1.p.orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in
---- rss-glx_0.9.1.p.orig/src/Makefile.in	2010-04-11 14:03:33.000000000 +0100
-+++ rss-glx_0.9.1.p/src/Makefile.in	2010-04-11 18:29:52.000000000 +0100
-@@ -446,6 +446,7 @@
- plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
- pixelcity_SOURCES = driver.c
- pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
-+pixelcity_LINK = $(CXXLINK)
- skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
- solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
- spirographx_SOURCES = driver.c spirographx.c
-@@ -599,7 +600,7 @@
- 	$(CXXLINK) $(lorenz_OBJECTS) $(lorenz_LDADD) $(LIBS)
- pixelcity$(EXEEXT): $(pixelcity_OBJECTS) $(pixelcity_DEPENDENCIES) 
- 	@rm -f pixelcity$(EXEEXT)
--	$(LINK) $(pixelcity_OBJECTS) $(pixelcity_LDADD) $(LIBS)
-+	$(pixelcity_LINK) $(pixelcity_OBJECTS) $(pixelcity_LDADD) $(LIBS)
- plasma$(EXEEXT): $(plasma_OBJECTS) $(plasma_DEPENDENCIES) 
- 	@rm -f plasma$(EXEEXT)
- 	$(CXXLINK) $(plasma_OBJECTS) $(plasma_LDADD) $(LIBS)
diff --git a/rss-glx.spec b/rss-glx.spec
index 4461257..6a78127 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,8 +58,8 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.1-0.9.1.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
-Patch1: rss-glx-0.9.1.p-autoreconf.patch
-Patch2: rss-glx-0.9.1.p-linker.patch
+Patch1: rss-glx-0.9.1.p-linker.patch
+Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -172,8 +172,8 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .autoreconf
-%patch2 -p1 -b .linker
+%patch1 -p1 -b .linker
+%patch10 -p1 -b .autoreconf
 
 %build
 %configure \
@@ -188,10 +188,10 @@ generate_fix_desktop_files_links () {
 	while read line; do
 %if %{with gss}
         # generate GNOME screensaver desktop files
-		eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; cmd=\"rss-glx-" $2 "\"; desc=\"" $3 "\""}')
+		eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; desktopfilename=\"rss-glx-" $2 ".desktop\"; cmd=\"rss-glx-" $3 "\"; desc=\"" $4 "\""}')
 		trycmd="${cmd%%%% *}"
         origtrycmd="${trycmd#rss-glx-}"
-		cat << EOF > %{buildroot}%{_gssconfigdir}/${cmd}.desktop
+		cat << EOF > %{buildroot}%{_gssconfigdir}/${desktopfilename}
 
 [Desktop Entry]
 Name=${name}
@@ -249,32 +249,32 @@ mkdir -p %{buildroot}%{xssbindir}
 mkdir -p %{buildroot}%{xssexthacksconfdir}
 %endif
 cat << EOF | generate_fix_desktop_files_links
-BioF§biof§This is an attempt to recreate some of the work of William Latham.
-Busy Spheres§busyspheres§Spheres made of dancing particles.
-Colorfire§colorfire§Burning colors.
-Cyclone§cyclone§A cyclone made of particles.
-Drempels§drempels§A hallucinatory desktop enhancer.
-Euphoria§euphoria§Psychedelic shapes.
-Feedback§feedback§Stirring colors with a jiggling warp.
-Fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
-Flocks§flocks§Floating wisps.
-Flux§flux§Flux fields and stuff.
-Helios§helios§Attraction/repulsion particle effects and some smooth surfaces.
-Hufo's Smoke§hufo_smoke§Particle smoke effect.
-Hufo's Tunnel§hufo_tunnel§Inside a tunnel.
-Hyperspace§hyperspace§Flying through hyper space.
-Lattice§lattice§Fly through an endless world of linked rings.
-Lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
+BioF§biof§biof§This is an attempt to recreate some of the work of William Latham.
+Busy Spheres§busyspheres§busyspheres§Spheres made of dancing particles.
+Colorfire§colorfire§colorfire§Burning colors.
+Cyclone§cyclone§cyclone§A cyclone made of particles.
+Drempels§drempels§drempels§A hallucinatory desktop enhancer.
+Euphoria§euphoria§euphoria§Psychedelic shapes.
+Feedback§feedback§feedback§Stirring colors with a jiggling warp.
+Fieldlines§fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
+Flocks§flocks§flocks§Floating wisps.
+Flux§flux§flux§Flux fields and stuff.
+Helios§helios§helios§Attraction/repulsion particle effects and some smooth surfaces.
+Hufo's Smoke§hufo_smoke§hufo_smoke§Particle smoke effect.
+Hufo's Tunnel§hufo_tunnel§hufo_tunnel§Inside a tunnel.
+Hyperspace§hyperspace§hyperspace§Flying through hyper space.
+Lattice§lattice§lattice§Fly through an endless world of linked rings.
+Lorenz§lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
-MatrixView§matrixview§The Matrix.
+MatrixView§matrixview§matrixview§The Matrix.
 %endif
-Pixel City§pixelcity§Procedural city fly through.
-Plasma§plasma§Oozing plasma.
-Skyrocket (silent)§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
-Skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
-Solarwinds§solarwinds§This is a very mesmerizing particle effects saver.
-SpirographX§spirographx§Spirograph-like screensaver.
-Sundancer2§sundancer2§Rotating stack of quads.
+Pixel City§pixelcity§pixelcity§Procedural city fly through.
+Plasma§plasma§plasma§Oozing plasma.
+Skyrocket (silent)§skyrocket-silent§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
+Skyrocket§skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
+Solarwinds§solarwinds§solarwinds§This is a very mesmerizing particle effects saver.
+SpirographX§spirographx§spirographx§Spirograph-like screensaver.
+Sundancer2§sundancer2§sundancer2§Rotating stack of quads.
 EOF
 
 %clean
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Oct 11 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-6
+- fix silent skyrocket desktop filename (#617531)
+
 * Wed Sep 29 2010 jkeating - 0.9.1.p-5
 - Rebuilt for gcc bug 634757
 
diff --git a/sources b/sources
index 0477243..f353def 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 bc420d230634fe8d3bbc79dc6a3c6678  rss-glx_0.9.1.p.tar.bz2
+86fdbdf7e06b184c70c1280c5a030021  rss-glx-0.9.1.p-6-autoreconf.patch.bz2

From 68ed601c5a49ae6d0481fad78c0fe5d24dbaec30 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 9 Feb 2011 02:49:31 -0600
Subject: [PATCH 32/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 6a78127..fec8513 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Oct 11 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-6
 - fix silent skyrocket desktop filename (#617531)
 

From 4e334d53e5ce58d558cab857e69c9ee0e6904395 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 20 Jun 2011 19:44:40 -0400
Subject: [PATCH 33/96] Rebuild for new glew soname

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index fec8513..043c67e 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Jun 20 2011 ajax@redhat.com - 0.9.1.p-8
+- Rebuild for new glew soname
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 2efdd5a4534cfa64332080fc63f83897315b7246 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Mon, 4 Jul 2011 16:54:07 +0200
Subject: [PATCH 34/96] rebuild against new ImageMagick

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 043c67e..92098bc 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Jul 04 2011 Nils Philippsen <nils@redhat.com> - 0.9.1.p-9
+- rebuild against new ImageMagick
+
 * Mon Jun 20 2011 ajax@redhat.com - 0.9.1.p-8
 - Rebuild for new glew soname
 

From 7aa180377d4f71d093db775bd14bcf624468832f Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 10 Jan 2012 15:59:34 +0100
Subject: [PATCH 35/96] rebuild for gcc 4.7

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 92098bc..6add41e 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Jan 10 2012 Nils Philippsen <nils@redhat.com> - 0.9.1.p-10
+- rebuild for gcc 4.7
+
 * Mon Jul 04 2011 Nils Philippsen <nils@redhat.com> - 0.9.1.p-9
 - rebuild against new ImageMagick
 

From 01ac3e77ad03256e59ee77ce222533b552ef4fae Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 13 Apr 2012 12:33:33 -0400
Subject: [PATCH 36/96] rebuild for new ImageMagick

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 6add41e..c158625 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Fri Apr 13 2012 Tom Callawau <spot@fedoraproject.org> - 0.9.1.p-11
+- rebuild for new ImageMagick
+
 * Tue Jan 10 2012 Nils Philippsen <nils@redhat.com> - 0.9.1.p-10
 - rebuild for gcc 4.7
 

From 6282411c731c05d74b368c52b0aca4843e587a36 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 21 Jul 2012 12:08:47 -0500
Subject: [PATCH 37/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index c158625..01fb70b 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Fri Apr 13 2012 Tom Callawau <spot@fedoraproject.org> - 0.9.1.p-11
 - rebuild for new ImageMagick
 

From 6aea1c2a0d7fa805a0bc138231c164f1c15712f8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 1 Aug 2012 09:59:06 -0400
Subject: [PATCH 38/96] Rebuild for new glew

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 01fb70b..2826865 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Wed Aug 01 2012 Adam Jackson <ajax@redhat.com> - 0.9.1.p-13
+- -Rebuild for new glew
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From b6db0be6b377082ff43ce32cb43abe35b20fe1dd Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 13 Dec 2012 13:41:07 -0500
Subject: [PATCH 39/96] Rebuild for glew 1.9.0

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 2826865..e822c73 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 0.9.1.p-14
+- Rebuild for glew 1.9.0
+
 * Wed Aug 01 2012 Adam Jackson <ajax@redhat.com> - 0.9.1.p-13
 - -Rebuild for new glew
 

From 421fdca7cded9797a48f6c74d0098da074c8f1bc Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 15:55:01 -0600
Subject: [PATCH 40/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index e822c73..a4c1a85 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 0.9.1.p-14
 - Rebuild for glew 1.9.0
 

From ccafc5650b79845837acfce03c3222bc11266fcf Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 30 Mar 2013 12:45:00 -0600
Subject: [PATCH 41/96] Rebuild for broken deps in rawhide

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index a4c1a85..b9be8ae 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sat Mar 30 2013 Kevin Fenzi <kevin@scrye.com> - 0.9.1.p-16
+- Rebuild for broken deps in rawhide
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 63c09686d91cb3ece2d84d8946866350c21a7915 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 08:02:53 -0500
Subject: [PATCH 42/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index b9be8ae..763c505 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Sat Mar 30 2013 Kevin Fenzi <kevin@scrye.com> - 0.9.1.p-16
 - Rebuild for broken deps in rawhide
 

From 33ce259f1ed4a26bd08555d7211e03d65ee5025c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 18 Nov 2013 10:52:55 +1000
Subject: [PATCH 43/96] rebuilt for GLEW 1.10

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 763c505..929d1f9 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -322,6 +322,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 0.9.1.p-18
+- rebuilt for GLEW 1.10
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From ddb87c04108ca11d8cff25d32ff3663c706e3692 Mon Sep 17 00:00:00 2001
From: josef radinger <cheese@nosuchhost.net>
Date: Tue, 1 Apr 2014 21:23:22 +0200
Subject: [PATCH 44/96] rename xml-files (#744862)

---
 rss-glx.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 929d1f9..c23ce11 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -277,6 +277,11 @@ SpirographX§spirographx§spirographx§Spirograph-like screensaver.
 Sundancer2§sundancer2§sundancer2§Rotating stack of quads.
 EOF
 
+cd %buildroot/%{xssconfigdir}/
+for file in *.xml; do
+    mv -f $file rss-glx-$file
+done
+
 %clean
 rm -rf %buildroot
 
@@ -322,6 +327,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Apr 01 2014 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-19
+- rename xml-files (#744862)
+
 * Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 0.9.1.p-18
 - rebuilt for GLEW 1.10
 

From 686f872432b71ba923db6a113254b51057da6469 Mon Sep 17 00:00:00 2001
From: josef radinger <cheese@nosuchhost.net>
Date: Wed, 2 Apr 2014 21:55:35 +0200
Subject: [PATCH 45/96] fix date in changelog

---
 rss-glx.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index c23ce11..e9fd557 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -327,6 +327,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Wed Apr 02 2014 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-20
+- fix date in changelog 
+
 * Tue Apr 01 2014 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-19
 - rename xml-files (#744862)
 
@@ -432,7 +435,7 @@ fi
 - -kde: drop Requires: kdebase (kdeartwork dep is enough)
 - fix %%kdessconfigdir for kde4
 
-* Fri Jan 31 2008 Adel Gadllah <adel.gadllah@gmail.com> 0.8.1.p-18
+* Thu Jan 31 2008 Adel Gadllah <adel.gadllah@gmail.com> 0.8.1.p-18
 - Fix build with gcc43
 
 * Mon Nov 05 2007 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-17

From 45429cdd2f432430626bd529d7f8219c2dee744f Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 22:00:06 -0500
Subject: [PATCH 46/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index e9fd557..8782cf7 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -327,6 +327,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Wed Apr 02 2014 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-20
 - fix date in changelog 
 

From 58de3d30863ed0cd81d605512ab483773ade4eff Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 00:22:05 +0000
Subject: [PATCH 47/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 8782cf7..9ee0c7f 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -327,6 +327,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 9bc364d31f4e2a71ab7ce8c686b826090a562ccc Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Tue, 28 Apr 2015 14:05:19 +0900
Subject: [PATCH 48/96] F-22+: Obsoletes -kde subpackage

---
 rss-glx.spec | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 9ee0c7f..0c5f154 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -78,6 +78,9 @@ BuildRequires: bzip2-devel
 BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
+%if 0%{?fedora} >= 22
+Obsoletes:     %{name}-kde < 0.9.1-22.900
+%endif
 
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -163,11 +166,13 @@ Build settings:
 %else
 - without modular xscreensaver support
 %endif
+%if 0%{?fedora} < 22
 %if %{with kde4}
 - with KDE4 support in: %kdessconfigdir
 %else
 - with KDE3 support in: %kdessconfigdir
 %endif
+%endif
 
 EOF
 %setup -q -n rss-glx_%{version}
@@ -282,6 +287,10 @@ for file in *.xml; do
     mv -f $file rss-glx-$file
 done
 
+%if 0%{?fedora} >= 22
+rm -rf %buildroot%{kdessconfigdir}
+%endif
+
 %clean
 rm -rf %buildroot
 
@@ -321,12 +330,17 @@ fi
 %{gssbindir}/*
 %endif
 
+%if 0%{?fedora} < 22
 %files kde
 %defattr(-, root, root)
 %dir %{kdessconfigdir}
 %{kdessconfigdir}/*.desktop
+%endif
 
 %changelog
+* Tue Apr 28 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.1.p-23
+- F-22+: Obsoletes -kde subpackage
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From a04419877bda5783e7f54bf495767703dfc593fd Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Tue, 28 Apr 2015 14:31:39 +0900
Subject: [PATCH 49/96] fix obsolete EVR

---
 rss-glx.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 0c5f154..5c8d082 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -79,7 +79,7 @@ BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
 %if 0%{?fedora} >= 22
-Obsoletes:     %{name}-kde < 0.9.1-22.900
+Obsoletes:     %{name}-kde < 0.9.1.p-23
 %endif
 
 %description
@@ -338,7 +338,7 @@ fi
 %endif
 
 %changelog
-* Tue Apr 28 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.1.p-23
+* Tue Apr 28 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.1.p-24
 - F-22+: Obsoletes -kde subpackage
 
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-22

From 1c8a8244af8adcac2008f864b6ec8fe30b8d4f32 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 18 Jun 2015 22:34:52 +0000
Subject: [PATCH 50/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 5c8d082..23314a9 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Tue Apr 28 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.1.p-24
 - F-22+: Obsoletes -kde subpackage
 

From 1d3d2b7760a5115ab2b545405212a0b37c9ab40f Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 14 Jan 2016 13:10:27 -0500
Subject: [PATCH 51/96] Rebuild for glew 1.13

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 23314a9..d3161cc 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 0.9.1.p-26
+- Rebuild for glew 1.13
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 7059bf71f0f70f20c1860196a81c999d2b70e3ea Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 19 Jan 2016 17:07:11 +0100
Subject: [PATCH 52/96] use %global instead of %define

---
 rss-glx.spec | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index d3161cc..a067ef5 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -2,14 +2,14 @@
 %if %{fedora} <= 4
 %bcond_with modular_x
 %bcond_with gss
-%define _gssconfigdir %{nil}%{?gssconfigdir}
+%global _gssconfigdir %{nil}%{?gssconfigdir}
 %else
 %bcond_without modular_x
 %bcond_without gss
 %if %{fedora} <= 5
-%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/gnome-screensaver/themes}%{?gssconfigdir}
+%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/gnome-screensaver/themes}%{?gssconfigdir}
 %else
-%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
+%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
 %if %{fedora} >= 7
 %bcond_without modular_xss
@@ -28,18 +28,18 @@
 %bcond_without modular_x
 %bcond_without modular_xss
 %bcond_without gss
-%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
+%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
 
-%define kdessconfigdir %{?with_kde4:%{_datadir}/kde4/services/ScreenSavers}%{!?with_kde4:%{_datadir}/applnk/System/ScreenSavers}
+%global kdessconfigdir %{?with_kde4:%{_datadir}/kde4/services/ScreenSavers}%{!?with_kde4:%{_datadir}/applnk/System/ScreenSavers}
 
-%define xssconfigdir %{_datadir}/xscreensaver/config
-%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
-%define xssbindir %{_libexecdir}/xscreensaver
-%define gssbindir %{_libexecdir}/gnome-screensaver
+%global xssconfigdir %{_datadir}/xscreensaver/config
+%global xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
+%global xssbindir %{_libexecdir}/xscreensaver
+%global gssbindir %{_libexecdir}/gnome-screensaver
 
 %bcond_with matrixview
-%define patchext %{nil}%{!?with_matrixview:.p}
+%global patchext %{nil}%{!?with_matrixview:.p}
 
 Summary: Really Slick Screensavers
 Name: rss-glx
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Tue Jan 19 2016 Nils Philippsen <nils@redhat.com>
+- use %%global instead of %%define
+
 * Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 0.9.1.p-26
 - Rebuild for glew 1.13
 

From f3965b00dfecfcf76e9fe6b392ad03cfb0fcab81 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 4 Feb 2016 22:20:15 +0000
Subject: [PATCH 53/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index a067ef5..551271e 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Tue Jan 19 2016 Nils Philippsen <nils@redhat.com>
 - use %%global instead of %%define
 

From 003df928ededbd3397c98a319c264bd454f5f663 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Tue, 10 Jan 2017 08:51:45 -0700
Subject: [PATCH 54/96] Rebuild for glew 2.0.0

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 551271e..41cd410 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 0.9.1.p-28
+- Rebuild for glew 2.0.0
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 7a738d05e850f41c0bea80fb9f982aab696e5cfb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 11:52:31 +0000
Subject: [PATCH 55/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 41cd410..cce08fb 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 0.9.1.p-28
 - Rebuild for glew 2.0.0
 

From 6c5b1680ab49b7d2117bb85f73b24e9328fa4e14 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 13:18:22 +0000
Subject: [PATCH 56/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index cce08fb..8bfcdec 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 40d008318fd9637164128038407b2cfb8d2ea0cc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 07:48:45 +0000
Subject: [PATCH 57/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 8bfcdec..3683f4f 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From d83af75d9370a6b7fb151dddeb95f9b4f8b76b51 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Mon, 28 Aug 2017 18:05:42 -0500
Subject: [PATCH 58/96] Rebuilt for ImageMagick 7

---
 rss-glx-imagemagick-7.patch | 69 +++++++++++++++++++++++++++++++++++++
 rss-glx.spec                | 13 +++++--
 2 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 rss-glx-imagemagick-7.patch

diff --git a/rss-glx-imagemagick-7.patch b/rss-glx-imagemagick-7.patch
new file mode 100644
index 0000000..f057d07
--- /dev/null
+++ b/rss-glx-imagemagick-7.patch
@@ -0,0 +1,69 @@
+--- a/src/TexMgr.cpp	2009-05-19 13:10:43.000000000 -0500
++++ b/src/TexMgr.cpp	2017-08-28 18:02:33.681798189 -0500
+@@ -25,8 +25,13 @@
+ #endif
+ #include <cstdlib>
+ 
+-#include <magick/api.h>
+-#include <wand/magick-wand.h>
++//#if MagickLibVersion >= 0x700
++#include <MagickCore/MagickCore.h>
++#include <MagickWand/MagickWand.h>
++//#else
++//#include <magick/api.h>
++//#include <wand/magick-wand.h>
++//#endif
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -255,10 +260,18 @@
+ // Directory scanning + image loading code in a separate function callable either from loadNextImage or another thread if pthreads is available.
+ void TexMgr::loadNextImageFromDisk() {
+ 	MagickWand *magick_wand = NewMagickWand();
+-	ExceptionInfo exception;
++//#if MagickLibVersion >= 0x700
++	ExceptionInfo *exception;
++//#else
++//	ExceptionInfo exception;
++//#endif
+ 	int dirLoop = 0;
+ 
+-	GetExceptionInfo (&exception);
++//#if MagickLibVersion >= 0x700
++	exception = AcquireExceptionInfo();
++//#else
++//	GetExceptionInfo (&exception);
++//#endif
+ 
+ 	int imageLoaded = 0;
+ 	do {
+@@ -267,6 +280,9 @@
+ 		if (!imageDir) {
+ 			if (dirLoop) {
+ 				dirName = "";
++//#if MagickLibVersion >= 0x700
++				DestroyExceptionInfo (exception);
++//#endif
+ 				return;
+ 			}
+ 
+@@ -317,11 +333,18 @@
+ 		nextH = ohh;
+ 	}
+ 
+-	ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, &exception);
++//#if MagickLibVersion >= 0x700
++	ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, exception);
++//#else
++//	ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, &exception);
++//#endif
+ 
+ 	magick_wand = DestroyMagickWand (magick_wand);
+ 
+ 	ready = true;
++//#if MagickLibVersion >= 0x700
++	DestroyExceptionInfo (exception);
++//#endif
+ }
+ 
+ void *TexMgr::imageThreadMain(void *vp)
diff --git a/rss-glx.spec b/rss-glx.spec
index 3683f4f..9a58a72 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -60,7 +60,8 @@ Source3: rss-glx-0.9.1-0.9.1.p.diff
 Patch0: rss-glx-0.9.0.p-optflags.patch
 Patch1: rss-glx-0.9.1.p-linker.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch11: rss-glx-imagemagick-7.patch
+
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
 BuildRequires: glew-devel
@@ -78,6 +79,7 @@ BuildRequires: bzip2-devel
 BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
+BuildRequires: automake autoconf libtool
 %if 0%{?fedora} >= 22
 Obsoletes:     %{name}-kde < 0.9.1.p-23
 %endif
@@ -179,6 +181,10 @@ EOF
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .linker
 %patch10 -p1 -b .autoreconf
+%patch11 -p1 -b .imagemagick
+cp configure.in configure.ac
+sed -i 's/ Wand / MagickWand /' configure.ac
+autoreconf -f -i
 
 %build
 %configure \
@@ -338,6 +344,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 28 2017 Michael Cronenworth <mike@cchtml.com> - 0.9.1.p-32
+- Rebuilt for ImageMagick
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From 84e527ec78073d7a025c11e514052fd5ec993564 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 5 Sep 2017 17:28:03 -0700
Subject: [PATCH 59/96] Rebuild for ImageMagick 6 reversion, drop ImageMagick 7
 patch

---
 rss-glx-imagemagick-7.patch | 69 -------------------------------------
 rss-glx.spec                | 11 +++---
 2 files changed, 4 insertions(+), 76 deletions(-)
 delete mode 100644 rss-glx-imagemagick-7.patch

diff --git a/rss-glx-imagemagick-7.patch b/rss-glx-imagemagick-7.patch
deleted file mode 100644
index f057d07..0000000
--- a/rss-glx-imagemagick-7.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/src/TexMgr.cpp	2009-05-19 13:10:43.000000000 -0500
-+++ b/src/TexMgr.cpp	2017-08-28 18:02:33.681798189 -0500
-@@ -25,8 +25,13 @@
- #endif
- #include <cstdlib>
- 
--#include <magick/api.h>
--#include <wand/magick-wand.h>
-+//#if MagickLibVersion >= 0x700
-+#include <MagickCore/MagickCore.h>
-+#include <MagickWand/MagickWand.h>
-+//#else
-+//#include <magick/api.h>
-+//#include <wand/magick-wand.h>
-+//#endif
- #include <dirent.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -255,10 +260,18 @@
- // Directory scanning + image loading code in a separate function callable either from loadNextImage or another thread if pthreads is available.
- void TexMgr::loadNextImageFromDisk() {
- 	MagickWand *magick_wand = NewMagickWand();
--	ExceptionInfo exception;
-+//#if MagickLibVersion >= 0x700
-+	ExceptionInfo *exception;
-+//#else
-+//	ExceptionInfo exception;
-+//#endif
- 	int dirLoop = 0;
- 
--	GetExceptionInfo (&exception);
-+//#if MagickLibVersion >= 0x700
-+	exception = AcquireExceptionInfo();
-+//#else
-+//	GetExceptionInfo (&exception);
-+//#endif
- 
- 	int imageLoaded = 0;
- 	do {
-@@ -267,6 +280,9 @@
- 		if (!imageDir) {
- 			if (dirLoop) {
- 				dirName = "";
-+//#if MagickLibVersion >= 0x700
-+				DestroyExceptionInfo (exception);
-+//#endif
- 				return;
- 			}
- 
-@@ -317,11 +333,18 @@
- 		nextH = ohh;
- 	}
- 
--	ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, &exception);
-+//#if MagickLibVersion >= 0x700
-+	ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, exception);
-+//#else
-+//	ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, &exception);
-+//#endif
- 
- 	magick_wand = DestroyMagickWand (magick_wand);
- 
- 	ready = true;
-+//#if MagickLibVersion >= 0x700
-+	DestroyExceptionInfo (exception);
-+//#endif
- }
- 
- void *TexMgr::imageThreadMain(void *vp)
diff --git a/rss-glx.spec b/rss-glx.spec
index 9a58a72..cbd3647 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -60,7 +60,6 @@ Source3: rss-glx-0.9.1-0.9.1.p.diff
 Patch0: rss-glx-0.9.0.p-optflags.patch
 Patch1: rss-glx-0.9.1.p-linker.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
-Patch11: rss-glx-imagemagick-7.patch
 
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -79,7 +78,6 @@ BuildRequires: bzip2-devel
 BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
-BuildRequires: automake autoconf libtool
 %if 0%{?fedora} >= 22
 Obsoletes:     %{name}-kde < 0.9.1.p-23
 %endif
@@ -181,10 +179,6 @@ EOF
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .linker
 %patch10 -p1 -b .autoreconf
-%patch11 -p1 -b .imagemagick
-cp configure.in configure.ac
-sed -i 's/ Wand / MagickWand /' configure.ac
-autoreconf -f -i
 
 %build
 %configure \
@@ -344,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep 05 2017 Adam Williamson <awilliam@redhat.com> - 0.9.1.p-33
+- Rebuild for ImageMagick 6 reversion, drop ImageMagick 7 patch
+
 * Mon Aug 28 2017 Michael Cronenworth <mike@cchtml.com> - 0.9.1.p-32
 - Rebuilt for ImageMagick
 

From 0d7da31c6ce471733fc872df104de8582347c77c Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Fri, 9 Feb 2018 09:05:58 +0100
Subject: [PATCH 60/96] Escape macros in %changelog

Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rss-glx.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index cbd3647..2c4e08a 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -338,6 +338,9 @@ fi
 %endif
 
 %changelog
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.1.p-34
+- Escape macros in %%changelog
+
 * Tue Sep 05 2017 Adam Williamson <awilliam@redhat.com> - 0.9.1.p-33
 - Rebuild for ImageMagick 6 reversion, drop ImageMagick 7 patch
 
@@ -511,10 +514,10 @@ fi
 - include %%post/%%postun scripts only with modular xscreensaver support
 
 * Fri Sep 14 2007 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-10
-- replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
+- replace requirement on %%{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
   RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5) 
 - license is GPLv2
-- run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
+- run %%{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
   xscreensaver-base >= 5.03-3 for that
 - don't reference upstream URL for source tarball as we ship a modified one
 
@@ -531,7 +534,7 @@ fi
 
 * Thu Jun 14 2007 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-7
 - build xscreensaver hack description files (#200881)
-- require %{_bindir}/kxsconfig (#219106)
+- require %%{_bindir}/kxsconfig (#219106)
 
 * Mon Aug 28 2006 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-6
 - FC6 mass rebuild

From ed96433ef331a35b1bb0cc99901193027e5d9686 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 14 Feb 2018 09:05:50 +0100
Subject: [PATCH 61/96] Remove %clean section

None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rss-glx.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 2c4e08a..bd70106 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -291,9 +291,6 @@ done
 rm -rf %buildroot%{kdessconfigdir}
 %endif
 
-%clean
-rm -rf %buildroot
-
 %if %{with modular_xss}
 %post xscreensaver
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then

From ab7c958f9af7108ed414b8b58b68fbbcf50578ac Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Mon, 9 Jul 2018 19:06:51 +0200
Subject: [PATCH 62/96] add BuildRequires: gcc

Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
---
 rss-glx.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rss-glx.spec b/rss-glx.spec
index bd70106..f098dd1 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -61,6 +61,7 @@ Patch0: rss-glx-0.9.0.p-optflags.patch
 Patch1: rss-glx-0.9.1.p-linker.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
 
+BuildRequires:  gcc
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
 BuildRequires: glew-devel

From 46b77e7f24c1bbd980973427e8608ed5c95feb70 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 10 Jul 2018 01:35:16 -0500
Subject: [PATCH 63/96] Remove needless use of %defattr

---
 rss-glx.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index f098dd1..55928bb 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -305,14 +305,12 @@ fi
 %endif
 
 %files
-%defattr(-, root, root)
 %doc ChangeLog COPYING INSTALL
 %doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.1-0.9.1.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
 
 %files xscreensaver
-%defattr(-, root, root)
 # xscreensaver-base provides %{xssexthacksconfdir}
 %config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
 %{xssconfigdir}/*.xml
@@ -321,7 +319,6 @@ fi
 
 %if %{with gss}
 %files gnome-screensaver
-%defattr(-, root, root)
 %dir %{_gssconfigdir}
 %{_gssconfigdir}/*.desktop
 %dir %{gssbindir}
@@ -330,7 +327,6 @@ fi
 
 %if 0%{?fedora} < 22
 %files kde
-%defattr(-, root, root)
 %dir %{kdessconfigdir}
 %{kdessconfigdir}/*.desktop
 %endif

From 70849e65b78db4d898c76387a9db1bab82468e28 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 03:45:28 +0000
Subject: [PATCH 64/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 55928bb..b694c9f 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 34%{?dist}
+Release: 35%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -332,6 +332,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.1.p-34
 - Escape macros in %%changelog
 

From e823e89b573513025c76e2a53e84c436299728e1 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 24 Jul 2018 16:43:17 +0200
Subject: [PATCH 65/96] Add missing BuildRequires on gcc-c++

../../libtool: line 1153: g++: command not found

References: https://bugzilla.redhat.com/show_bug.cgi?id=1606135
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rss-glx.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rss-glx.spec b/rss-glx.spec
index b694c9f..92136ee 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -61,6 +61,7 @@ Patch0: rss-glx-0.9.0.p-optflags.patch
 Patch1: rss-glx-0.9.1.p-linker.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
 
+BuildRequires:  gcc-c++
 BuildRequires:  gcc
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel

From f926e4a9067d9f73989e8bbe8659b3944a6827a7 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Thu, 23 Aug 2018 14:07:39 +0200
Subject: [PATCH 66/96] - Rebuilt for glew 2.1.0

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 92136ee..87a1984 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -333,6 +333,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 0.9.1.p-36
+- Rebuilt for glew 2.1.0
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From fced21fa773d97c674cfb92d56c67ab776285d79 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Tue, 28 Aug 2018 16:18:19 -0500
Subject: [PATCH 67/96] Rebuild for ImageMagick 6.9.10

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 87a1984..193aac6 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 36%{?dist}
+Release: 37%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -333,6 +333,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 28 2018 Michael Cronenworth <mike@cchtml.com> - 0.9.1.p-37
+- Rebuild for new ImageMagick 6.9.10
+
 * Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 0.9.1.p-36
 - Rebuilt for glew 2.1.0
 

From 4d2bba372dca9d1494236007e9d3eed874d2552e Mon Sep 17 00:00:00 2001
From: josef radinger <cheese@nosuchhost.net>
Date: Fri, 31 Aug 2018 15:26:27 +0200
Subject: [PATCH 68/96] fix rss-glx-0.9.1.p-linker.patch (reorder and patch
 Makefile.in instead of Makefile.am)

---
 rss-glx-0.9.1.p-linker.patch | 15 ++++++++-------
 rss-glx.spec                 |  9 ++++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/rss-glx-0.9.1.p-linker.patch b/rss-glx-0.9.1.p-linker.patch
index ac03384..cd5b8ce 100644
--- a/rss-glx-0.9.1.p-linker.patch
+++ b/rss-glx-0.9.1.p-linker.patch
@@ -1,11 +1,12 @@
-diff -ru rss-glx_0.9.1.p.orig/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
---- rss-glx_0.9.1.p.orig/src/Makefile.am	2010-04-11 14:03:33.000000000 +0100
-+++ rss-glx_0.9.1.p/src/Makefile.am	2010-04-11 18:29:45.000000000 +0100
-@@ -36,6 +36,7 @@
+diff -ru rss-glx_0.9.1.p.orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in
+--- rss-glx_0.9.1.p.orig/src/Makefile.in.linker	2018-08-31 15:13:51.668365086 +0200
++++ rss-glx_0.9.1.p/src/Makefile.in	2018-08-31 15:16:21.985747074 +0200
+@@ -446,7 +446,7 @@
+ lorenz_LDADD = -LrsMath -lrsMath
  plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
  pixelcity_SOURCES = driver.c
- pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
-+pixelcity_LINK = $(CXXLINK)
+-pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
++pixelcity_LDADD = -LPixelCity -lPixelCity @quesoglc_LIBS@ 
+ pixelcity_LINK = $(CXXLINK)
  skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
  solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
- spirographx_SOURCES = driver.c spirographx.c
diff --git a/rss-glx.spec b/rss-glx.spec
index 193aac6..07e6f5c 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,8 +58,8 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.1-0.9.1.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
-Patch1: rss-glx-0.9.1.p-linker.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
+Patch11: rss-glx-0.9.1.p-linker.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
@@ -179,8 +179,8 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .linker
 %patch10 -p1 -b .autoreconf
+%patch11 -p1 -b .linker
 
 %build
 %configure \
@@ -333,6 +333,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 31 2018 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-38
+- fix rss-glx-0.9.1.p-linker.patch (reorder and patch Makefile.in instead of Makefile.am)
+
 * Tue Aug 28 2018 Michael Cronenworth <mike@cchtml.com> - 0.9.1.p-37
 - Rebuild for new ImageMagick 6.9.10
 

From ebe801563617718782cd91adfec200dda6bd2ca1 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:21 +0100
Subject: [PATCH 69/96] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 rss-glx.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 07e6f5c..1ce4fdc 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -46,7 +46,6 @@ Name: rss-glx
 Version: 0.9.1%{patchext}
 Release: 38%{?dist}
 License: GPLv2
-Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
 # The original URL is the following without %%patchext:
@@ -94,7 +93,6 @@ order to use them as screensavers.
 
 %package xscreensaver
 Summary: Really Slick Screensavers
-Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if %{with modular_xss}
 Requires(post): xscreensaver-base >= 1:5.03-3
@@ -115,7 +113,6 @@ This package contains files needed to use the hacks with xscreensaver.
 %if %{with gss}
 %package gnome-screensaver
 Summary: Really Slick Screensavers
-Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: gnome-screensaver
 
@@ -128,7 +125,6 @@ This package contains files needed to use the hacks with gnome-screensaver.
 
 %package kde
 Summary: Really Slick Screensavers
-Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5

From 8b1ab4ce98b50f50adf8d8b603071fcb5ff35a7d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 2 Feb 2019 11:37:47 +0000
Subject: [PATCH 70/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 1ce4fdc..a3fdcd7 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -329,6 +329,9 @@ fi
 %endif
 
 %changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Thu Aug 31 2018 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-38
 - fix rss-glx-0.9.1.p-linker.patch (reorder and patch Makefile.in instead of Makefile.am)
 

From df5ab96aae9fb90474c3b73f8f5267e69b492b4e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jul 2019 18:48:42 +0000
Subject: [PATCH 71/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index a3fdcd7..d11f851 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -329,6 +329,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-39
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 35e31491734ea03a152d3cf12b58ad5a156a3fde Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 30 Jan 2020 17:55:16 +0000
Subject: [PATCH 72/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index d11f851..5908e86 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 40%{?dist}
+Release: 41%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -329,6 +329,9 @@ fi
 %endif
 
 %changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-40
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 2b59d4e38177852454c8f27afeedee7e501a8e26 Mon Sep 17 00:00:00 2001
From: josef radinger <cheese@nosuchhost.net>
Date: Sat, 16 May 2020 15:33:11 +0200
Subject: [PATCH 73/96] fix pixelcity rss-glx-0.9.1.p-pixelcity.patch

---
 rss-glx-0.9.1.p-pixelcity.patch | 11 +++++++++++
 rss-glx.spec                    |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 rss-glx-0.9.1.p-pixelcity.patch

diff --git a/rss-glx-0.9.1.p-pixelcity.patch b/rss-glx-0.9.1.p-pixelcity.patch
new file mode 100644
index 0000000..c036914
--- /dev/null
+++ b/rss-glx-0.9.1.p-pixelcity.patch
@@ -0,0 +1,11 @@
+--- rss-glx_0.9.1.p.orig/src/PixelCity/Mesh.cpp	2010-01-04 04:12:24.000000000 +0100
++++ rss-glx_0.9.1.p/src/PixelCity/Mesh.cpp	2020-05-16 15:22:13.288970473 +0200
+@@ -118,7 +118,7 @@
+   }
+   for (qsi = _quad_strip.begin(); qsi < _quad_strip.end(); ++qsi) {
+     glBegin (GL_QUAD_STRIP);
+-    for (n = qsi->index_list.begin(); n < qsi->index_list.end(); ++n) {
++    for (n = qsi->index_list.begin(); n < qsi->index_list.end() -1 ; ++n) {
+       glTexCoord2fv (&_vertex[*n].uv.x);
+       glVertex3fv (&_vertex[*n].position.x);
+     }
diff --git a/rss-glx.spec b/rss-glx.spec
index 5908e86..0b3f94d 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 41%{?dist}
+Release: 42%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -59,6 +59,7 @@ Source3: rss-glx-0.9.1-0.9.1.p.diff
 Patch0: rss-glx-0.9.0.p-optflags.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
 Patch11: rss-glx-0.9.1.p-linker.patch
+Patch12: rss-glx-0.9.1.p-pixelcity.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
@@ -177,6 +178,7 @@ EOF
 %patch0 -p1 -b .optflags
 %patch10 -p1 -b .autoreconf
 %patch11 -p1 -b .linker
+%patch12 -p1 -b .pixelcity
 
 %build
 %configure \
@@ -329,6 +331,9 @@ fi
 %endif
 
 %changelog
+* Sat May 16 2020 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-42
+- fix pixelcity rss-glx-0.9.1.p-pixelcity.patch
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-41
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 90f3322dec3e94cf4034a07448cebeeaf3a97bbc Mon Sep 17 00:00:00 2001
From: josef radinger <cheese@nosuchhost.net>
Date: Sun, 7 Jun 2020 15:39:51 +0200
Subject: [PATCH 74/96] remove dependency onto gnome-screensaver and some
 cleanup

---
 rss-glx-matrixview.conf |  48 ++++++++++
 rss-glx.conf            |  48 ++++++++++
 rss-glx.spec            | 199 +++++-----------------------------------
 3 files changed, 117 insertions(+), 178 deletions(-)
 create mode 100644 rss-glx-matrixview.conf
 create mode 100644 rss-glx.conf

diff --git a/rss-glx-matrixview.conf b/rss-glx-matrixview.conf
new file mode 100644
index 0000000..33f631c
--- /dev/null
+++ b/rss-glx-matrixview.conf
@@ -0,0 +1,48 @@
+GL:     "BioF" \
+        rss-glx-biof -r \n\
+GL:     "Busy Spheres" \
+        rss-glx-busyspheres -r \n\
+GL:     "Colorfire" \
+        rss-glx-colorfire -r \n\
+GL:     "Cyclone" \
+        rss-glx-cyclone -r \n\
+GL:     "Drempels" \
+        rss-glx-drempels -r \n\
+GL:     "Euphoria" \
+        rss-glx-euphoria -r \n\
+GL:     "Feedback" \
+        rss-glx-feedback -r \n\
+GL:     "Fieldlines" \
+        rss-glx-fieldlines -r \n\
+GL:     "Flocks" \
+        rss-glx-flocks -r \n\
+GL:     "Flux" \
+        rss-glx-flux -r \n\
+GL:     "Helios" \
+        rss-glx-helios -r \n\
+GL:     "Hufo's Smoke" \
+        rss-glx-hufo_smoke -r \n\
+GL:     "Hufo's Tunnel" \
+        rss-glx-hufo_tunnel -r \n\
+GL:     "Hyperspace" \
+        rss-glx-hyperspace -r \n\
+GL:     "Lattice" \
+        rss-glx-lattice -r \n\
+GL:     "Lorenz" \
+        rss-glx-lorenz -r \n\
+GL:     "Pixel City" \
+        rss-glx-pixelcity -r \n\
+GL:     "Plasma" \
+        rss-glx-plasma -r \n\
+GL:     "Skyrocket (silent)" \
+        rss-glx-skyrocket -v 0 -r \n\
+GL:     "Skyrocket" \
+        rss-glx-skyrocket -r \n\
+GL:     "Solarwinds" \
+        rss-glx-solarwinds -r \n\
+GL:     "SpirographX" \
+        rss-glx-spirographx -r \n\
+GL:     "Sundancer2" \
+        rss-glx-sundancer2 -r \n\
+GL:     "Matrix" \
+        rss-glx-matrixview -r \n\
diff --git a/rss-glx.conf b/rss-glx.conf
new file mode 100644
index 0000000..33f631c
--- /dev/null
+++ b/rss-glx.conf
@@ -0,0 +1,48 @@
+GL:     "BioF" \
+        rss-glx-biof -r \n\
+GL:     "Busy Spheres" \
+        rss-glx-busyspheres -r \n\
+GL:     "Colorfire" \
+        rss-glx-colorfire -r \n\
+GL:     "Cyclone" \
+        rss-glx-cyclone -r \n\
+GL:     "Drempels" \
+        rss-glx-drempels -r \n\
+GL:     "Euphoria" \
+        rss-glx-euphoria -r \n\
+GL:     "Feedback" \
+        rss-glx-feedback -r \n\
+GL:     "Fieldlines" \
+        rss-glx-fieldlines -r \n\
+GL:     "Flocks" \
+        rss-glx-flocks -r \n\
+GL:     "Flux" \
+        rss-glx-flux -r \n\
+GL:     "Helios" \
+        rss-glx-helios -r \n\
+GL:     "Hufo's Smoke" \
+        rss-glx-hufo_smoke -r \n\
+GL:     "Hufo's Tunnel" \
+        rss-glx-hufo_tunnel -r \n\
+GL:     "Hyperspace" \
+        rss-glx-hyperspace -r \n\
+GL:     "Lattice" \
+        rss-glx-lattice -r \n\
+GL:     "Lorenz" \
+        rss-glx-lorenz -r \n\
+GL:     "Pixel City" \
+        rss-glx-pixelcity -r \n\
+GL:     "Plasma" \
+        rss-glx-plasma -r \n\
+GL:     "Skyrocket (silent)" \
+        rss-glx-skyrocket -v 0 -r \n\
+GL:     "Skyrocket" \
+        rss-glx-skyrocket -r \n\
+GL:     "Solarwinds" \
+        rss-glx-solarwinds -r \n\
+GL:     "SpirographX" \
+        rss-glx-spirographx -r \n\
+GL:     "Sundancer2" \
+        rss-glx-sundancer2 -r \n\
+GL:     "Matrix" \
+        rss-glx-matrixview -r \n\
diff --git a/rss-glx.spec b/rss-glx.spec
index 0b3f94d..27b0735 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -1,42 +1,14 @@
 %if 0%{?fedora}
-%if %{fedora} <= 4
-%bcond_with modular_x
-%bcond_with gss
-%global _gssconfigdir %{nil}%{?gssconfigdir}
-%else
 %bcond_without modular_x
-%bcond_without gss
-%if %{fedora} <= 5
-%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/gnome-screensaver/themes}%{?gssconfigdir}
-%else
-%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
-%endif
-%if %{fedora} >= 7
 %bcond_without modular_xss
 %else
+%bcond_with modular_x
 %bcond_with modular_xss
 %endif
-%if %{fedora} >= 8
-# KDE4
-%bcond_without kde4
-%else
-# KDE3
-%bcond_with kde4
-%endif
-%endif
-%else
-%bcond_without modular_x
-%bcond_without modular_xss
-%bcond_without gss
-%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
-%endif
-
-%global kdessconfigdir %{?with_kde4:%{_datadir}/kde4/services/ScreenSavers}%{!?with_kde4:%{_datadir}/applnk/System/ScreenSavers}
 
 %global xssconfigdir %{_datadir}/xscreensaver/config
 %global xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
 %global xssbindir %{_libexecdir}/xscreensaver
-%global gssbindir %{_libexecdir}/gnome-screensaver
 
 %bcond_with matrixview
 %global patchext %{nil}%{!?with_matrixview:.p}
@@ -44,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -55,6 +27,8 @@ Source1: README.fedora
 # The following two strip matrixview from the package and build a new tarball
 Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.1-0.9.1.p.diff
+Source4: rss-glx-matrixview.conf
+Source5: rss-glx.conf
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
@@ -80,9 +54,6 @@ BuildRequires: bzip2-devel
 BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
-%if 0%{?fedora} >= 22
-Obsoletes:     %{name}-kde < 0.9.1.p-23
-%endif
 
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -111,35 +82,6 @@ impressive and graphically intensive screensavers.
 
 This package contains files needed to use the hacks with xscreensaver.
 
-%if %{with gss}
-%package gnome-screensaver
-Summary: Really Slick Screensavers
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: gnome-screensaver
-
-%description gnome-screensaver
-A port of the Really Slick Screensavers to GLX. Provides several visually
-impressive and graphically intensive screensavers.
-
-This package contains files needed to use the hacks with gnome-screensaver.
-%endif
-
-%package kde
-Summary: Really Slick Screensavers
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5
-Requires: kdeartwork-extras
-%else
-Requires: kdeartwork-kxs
-%endif
-
-%description kde
-A port of the Really Slick Screensavers to GLX. Provides several visually
-impressive and graphically intensive screensavers.
-
-This package contains files needed to use the hacks with KDE.
-
 %prep
 cat << EOF
 
@@ -149,12 +91,6 @@ Build settings:
 %else
 - with monolithic X
 %endif
-%if %{with gss}
-- with gnome-screensaver support,
-  theme directory: %{_gssconfigdir}
-%else
-- without gnome-screensaver support
-%endif
 %if %{with matrixview}
 - with matrixview hack
 %else
@@ -166,14 +102,10 @@ Build settings:
 - without modular xscreensaver support
 %endif
 %if 0%{?fedora} < 22
-%if %{with kde4}
-- with KDE4 support in: %kdessconfigdir
-%else
-- with KDE3 support in: %kdessconfigdir
-%endif
 %endif
 
 EOF
+
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
 %patch10 -p1 -b .autoreconf
@@ -183,114 +115,33 @@ EOF
 %build
 %configure \
     --with-configdir=%{xssconfigdir} \
-    --with-kdessconfigdir=%{kdessconfigdir} \
     --program-prefix=rss-glx-
 make %{?_smp_mflags}
 
 %install
-generate_fix_desktop_files_links () {
-	local line name trycmd cmd desc
-	while read line; do
-%if %{with gss}
-        # generate GNOME screensaver desktop files
-		eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; desktopfilename=\"rss-glx-" $2 ".desktop\"; cmd=\"rss-glx-" $3 "\"; desc=\"" $4 "\""}')
-		trycmd="${cmd%%%% *}"
-        origtrycmd="${trycmd#rss-glx-}"
-		cat << EOF > %{buildroot}%{_gssconfigdir}/${desktopfilename}
-
-[Desktop Entry]
-Name=${name}
-Comment=${desc}
-TryExec=${trycmd}
-Exec=${cmd} -r
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=GNOME;Screensaver;
-EOF
-		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{gssbindir}/${trycmd}"
-%endif
-        # fix KDE screensaver desktop files
-        pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null
-        if [ ! -f "${trycmd}.desktop" ]; then
-            awk '
-{
-    if ($0 ~ "^Actions=") {
-        print "Actions=InWindow;Root;Setup;";
-        print "X-KDE-Category=Really Slick Screensavers";
-        print "X-KDE-Type=OpenGL";
-    } else {
-        if ($0 ~ "^Type=") {
-            print "Type=Service";
-            print "X-KDE-ServiceTypes=ScreenSaver";
-        } else {
-            if ($0 !~ "^Encoding=") {
-                print;
-            }
-        }
-    }
-}' < "${origtrycmd}.desktop" | sed 's@^Exec=\(.*\)'"$origtrycmd"'\(.*\)$@Exec=\1'"$trycmd"'\2@g' > "${trycmd}.desktop"
-            rm -f "${origtrycmd}.desktop"
-        fi
-        popd >& /dev/null
-        # external hacks description and symlinks for XScreenSaver
-        cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
-GL:     "${name}" \\
-        ${cmd} -r \\n\\
-EOF
-		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}"
-	done
-}
-
-rm -rf %buildroot
 install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}%{_libdir}/lib*.{,l}a
 rm %{buildroot}%{_bindir}/rss-glx-rss-glx_install.pl
-%if %{with gss}
-mkdir -p %{buildroot}%{_gssconfigdir}
-mkdir -p %{buildroot}%{gssbindir}
+
 mkdir -p %{buildroot}%{xssbindir}
 mkdir -p %{buildroot}%{xssexthacksconfdir}
-%endif
-cat << EOF | generate_fix_desktop_files_links
-BioF§biof§biof§This is an attempt to recreate some of the work of William Latham.
-Busy Spheres§busyspheres§busyspheres§Spheres made of dancing particles.
-Colorfire§colorfire§colorfire§Burning colors.
-Cyclone§cyclone§cyclone§A cyclone made of particles.
-Drempels§drempels§drempels§A hallucinatory desktop enhancer.
-Euphoria§euphoria§euphoria§Psychedelic shapes.
-Feedback§feedback§feedback§Stirring colors with a jiggling warp.
-Fieldlines§fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
-Flocks§flocks§flocks§Floating wisps.
-Flux§flux§flux§Flux fields and stuff.
-Helios§helios§helios§Attraction/repulsion particle effects and some smooth surfaces.
-Hufo's Smoke§hufo_smoke§hufo_smoke§Particle smoke effect.
-Hufo's Tunnel§hufo_tunnel§hufo_tunnel§Inside a tunnel.
-Hyperspace§hyperspace§hyperspace§Flying through hyper space.
-Lattice§lattice§lattice§Fly through an endless world of linked rings.
-Lorenz§lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
-MatrixView§matrixview§matrixview§The Matrix.
+install -m 0644 "%SOURCE4" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
+%else
+install -m 0644 "%SOURCE5" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
 %endif
-Pixel City§pixelcity§pixelcity§Procedural city fly through.
-Plasma§plasma§plasma§Oozing plasma.
-Skyrocket (silent)§skyrocket-silent§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
-Skyrocket§skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
-Solarwinds§solarwinds§solarwinds§This is a very mesmerizing particle effects saver.
-SpirographX§spirographx§spirographx§Spirograph-like screensaver.
-Sundancer2§sundancer2§sundancer2§Rotating stack of quads.
-EOF
+
+cd %buildroot/%{_bindir}/
+for file in rss-glx*; do
+    ln -snf "%{_bindir}/${file}" "%{buildroot}%{xssbindir}/${file}"
+done
 
 cd %buildroot/%{xssconfigdir}/
 for file in *.xml; do
-    mv -f $file rss-glx-$file
+    mv -f ${file} rss-glx-${file}
 done
 
-%if 0%{?fedora} >= 22
-rm -rf %buildroot%{kdessconfigdir}
-%endif
-
 %if %{with modular_xss}
 %post xscreensaver
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
@@ -316,21 +167,13 @@ fi
 %dir %{xssbindir}
 %{xssbindir}/*
 
-%if %{with gss}
-%files gnome-screensaver
-%dir %{_gssconfigdir}
-%{_gssconfigdir}/*.desktop
-%dir %{gssbindir}
-%{gssbindir}/*
-%endif
-
-%if 0%{?fedora} < 22
-%files kde
-%dir %{kdessconfigdir}
-%{kdessconfigdir}/*.desktop
-%endif
-
 %changelog
+* Sat Jun 06 2020 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-43
+- we no longer have gnome-screensaver
+- and we have no kde-packages for long times, too
+- specfile-cleanup
+
+
 * Sat May 16 2020 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-42
 - fix pixelcity rss-glx-0.9.1.p-pixelcity.patch
 

From 96db1e85f44ba851027a73af4044e694b6f01856 Mon Sep 17 00:00:00 2001
From: josef radinger <cheese@nosuchhost.net>
Date: Sun, 7 Jun 2020 15:55:36 +0200
Subject: [PATCH 75/96] fix #rhbz1841249

---
 rss-glx.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 27b0735..fdf7eb6 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -55,6 +55,10 @@ BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
 
+%if 0%{?fedora} >= 33
+Obsoletes:     %{name}-gnome-screensaver < 0.9.1.p-43
+%endif
+
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
 impressive and graphically intensive screensavers.
@@ -72,9 +76,7 @@ Requires(postun): xscreensaver-base >= 1:5.03-3
 %else
 Requires: xscreensaver-base < 1:5.03-3
 %endif
-%if 0%{?fedora} >= 7
 Requires: xscreensaver-gl-base
-%endif
 
 %description xscreensaver
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -101,9 +103,6 @@ Build settings:
 %else
 - without modular xscreensaver support
 %endif
-%if 0%{?fedora} < 22
-%endif
-
 EOF
 
 %setup -q -n rss-glx_%{version}
@@ -168,6 +167,10 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Sun Jun 07 2020 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-44
+- obsolete rss-glx-gnome-screensaver
+- further cleanup
+
 * Sat Jun 06 2020 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-43
 - we no longer have gnome-screensaver
 - and we have no kde-packages for long times, too

From 8e916c05b571fa9329767ac0642bbfa7ac4baa12 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 05:58:02 +0000
Subject: [PATCH 76/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index fdf7eb6..a88995d 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 44%{?dist}
+Release: 45%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -167,6 +167,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Sun Jun 07 2020 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-44
 - obsolete rss-glx-gnome-screensaver
 - further cleanup

From 4fecbf7e3ad810e858cb3601cd2d1c48ae9d58a7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 1 Aug 2020 08:02:45 +0000
Subject: [PATCH 77/96] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index a88995d..34947e2 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 45%{?dist}
+Release: 46%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -167,6 +167,10 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-46
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-45
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From a1be5ecd5b3f9d16cf75840c5e166ce912c09a75 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Tue, 15 Sep 2020 11:53:02 -0600
Subject: [PATCH 78/96] Fix missing include of cstddef for gcc-11

---
 rss-glx-gcc11.patch | 12 ++++++++++++
 rss-glx.spec        |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 rss-glx-gcc11.patch

diff --git a/rss-glx-gcc11.patch b/rss-glx-gcc11.patch
new file mode 100644
index 0000000..53ad7d2
--- /dev/null
+++ b/rss-glx-gcc11.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Implicit/impSurface.h b/src/Implicit/impSurface.h
+index 41fab81..ecb692a 100644
+--- a/src/Implicit/impSurface.h
++++ b/src/Implicit/impSurface.h
+@@ -27,6 +27,7 @@
+ #endif
+ #include <vector>
+ #include <GL/gl.h>
++#include <cstddef>
+ 
+ 
+ class impSurface{
diff --git a/rss-glx.spec b/rss-glx.spec
index 34947e2..de0cdea 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 46%{?dist}
+Release: 47%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -34,6 +34,7 @@ Patch0: rss-glx-0.9.0.p-optflags.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
 Patch11: rss-glx-0.9.1.p-linker.patch
 Patch12: rss-glx-0.9.1.p-pixelcity.patch
+Patch13: rss-glx-gcc11.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
@@ -110,6 +111,7 @@ EOF
 %patch10 -p1 -b .autoreconf
 %patch11 -p1 -b .linker
 %patch12 -p1 -b .pixelcity
+%patch13 -p1 -b .gcc11
 
 %build
 %configure \
@@ -167,6 +169,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Tue Sep 15 2020 Jeff Law <law@redhat.com> - 0.9.1.p-47
+- Fix missing include of cstddef for gcc-11
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-46
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

From 944f8bef14b80a34f4e64916d18bc193ee1e00c1 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Fri, 8 Jan 2021 20:55:47 +0000
Subject: [PATCH 79/96] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 rss-glx.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rss-glx.spec b/rss-glx.spec
index de0cdea..bd83e33 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -36,6 +36,7 @@ Patch11: rss-glx-0.9.1.p-linker.patch
 Patch12: rss-glx-0.9.1.p-pixelcity.patch
 Patch13: rss-glx-gcc11.patch
 
+BuildRequires: make
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
 BuildRequires: libGL-devel

From 7cb2cf564e16ffc1dea1fcb6471d51532147c214 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 15:29:50 +0000
Subject: [PATCH 80/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index bd83e33..647b491 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 47%{?dist}
+Release: 48%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -170,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-48
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Sep 15 2020 Jeff Law <law@redhat.com> - 0.9.1.p-47
 - Fix missing include of cstddef for gcc-11
 

From 164129e648638db0ea578dc512b7db656deda57f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 11:39:16 +0000
Subject: [PATCH 81/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 647b491..9321ccb 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 48%{?dist}
+Release: 49%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -170,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-49
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-48
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From a32eb63ed5b022999405e100658fa5404c7fee23 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sun, 17 Oct 2021 15:58:13 +0900
Subject: [PATCH 82/96] Rebuild against new ImageMagick

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 9321ccb..3d2ab11 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 49%{?dist}
+Release: 50%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -170,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Sun Oct 17 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.1.p-50
+- Rebuild against new ImageMagick
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-49
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 7b9a464fd40585c27dd3e6a77e47a396874ee347 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jan 2022 18:05:49 +0000
Subject: [PATCH 83/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 3d2ab11..4c1ec8e 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 50%{?dist}
+Release: 51%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -170,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-51
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Sun Oct 17 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.1.p-50
 - Rebuild against new ImageMagick
 

From 52d0f85a46a96748fd28eb3ad658cbde03f63f79 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 9 Feb 2022 21:07:29 -0700
Subject: [PATCH 84/96] Rebuild for glew 2.2

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 4c1ec8e..03fa822 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 51%{?dist}
+Release: 52%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -170,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 0.9.1.p-52
+- Rebuild for glew 2.2
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-51
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From db63a0ded36b05eacd0f76c972b5675d29da9489 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 01:05:36 +0000
Subject: [PATCH 85/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 03fa822..c779520 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 52%{?dist}
+Release: 53%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -170,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-53
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 0.9.1.p-52
 - Rebuild for glew 2.2
 

From 8e334bd6353b485ced7b12684d6f4d54db9ad148 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sun, 4 Dec 2022 16:47:47 -0500
Subject: [PATCH 86/96] Add patch for ImageMagick 7 compatibility

---
 rss-glx-ImageMagick7.patch | 52 ++++++++++++++++++++++++++++++++++++++
 rss-glx.spec               | 16 ++++++------
 2 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 rss-glx-ImageMagick7.patch

diff --git a/rss-glx-ImageMagick7.patch b/rss-glx-ImageMagick7.patch
new file mode 100644
index 0000000..cdb7ec8
--- /dev/null
+++ b/rss-glx-ImageMagick7.patch
@@ -0,0 +1,52 @@
+Index: rss-glx_0.9.1/configure.in
+===================================================================
+--- rss-glx_0.9.1.orig/configure.in	2017-03-27 13:34:31.042941813 +0200
++++ rss-glx_0.9.1/configure.in	2017-03-27 13:34:31.050941977 +0200
+@@ -75,7 +75,7 @@ fi
+ AC_CHECK_FUNCS(random_r nrand48)
+ 
+ # Check for ImageMagick.
+-PKG_CHECK_MODULES(Wand, Wand >= 6.4)
++PKG_CHECK_MODULES(MagickWand, MagickWand >= 6.4)
+ 
+ if test -d src/skyrocket_sounds ; then
+ 	AC_ARG_ENABLE(sound, [  --disable-sound         Don't compile with sound.])
+Index: rss-glx_0.9.1/src/Makefile.am
+===================================================================
+--- rss-glx_0.9.1.orig/src/Makefile.am	2010-01-04 01:44:04.000000000 +0100
++++ rss-glx_0.9.1/src/Makefile.am	2017-03-27 13:36:06.468859903 +0200
+@@ -12,8 +12,8 @@ colorfire_LDADD = @BZIP2@
+ cyclone_SOURCES = driver.c cyclone.cpp rgbhsl.h rgbhsl.cpp rsRand.h
+ cyclone_LDADD = -LrsMath -lrsMath
+ drempels_SOURCES = driver.h driver.c drempels.cpp gpoly.h gpoly.cpp TexMgr.h TexMgr.cpp rgbhsl.h rgbhsl.cpp noise1234.h noise1234.c
+-drempels_CXXFLAGS = @Wand_CFLAGS@
+-drempels_LDADD = @PTHREAD_LIBS@ @Wand_LIBS@
++drempels_CXXFLAGS = @MagickWand_CFLAGS@
++drempels_LDADD = @PTHREAD_LIBS@ @MagickWand_LIBS@
+ euphoria_SOURCES = driver.h driver.c euphoria.cpp euphoria_textures.h euphoria_textures.c rgbhsl.h rgbhsl.cpp
+ euphoria_LDADD = -LrsMath -lrsMath @BZIP2@
+ feedback_SOURCES = driver.c feedback.cpp rgbhsl.h rgbhsl.cpp
+Index: rss-glx_0.9.1/src/TexMgr.cpp
+===================================================================
+--- rss-glx_0.9.1.orig/src/TexMgr.cpp	2009-05-19 20:10:43.000000000 +0200
++++ rss-glx_0.9.1/src/TexMgr.cpp	2017-03-27 13:34:31.050941977 +0200
+@@ -25,8 +25,8 @@
+ #endif
+ #include <cstdlib>
+ 
+-#include <magick/api.h>
+-#include <wand/magick-wand.h>
++#include <magick/MagickCore.h>
++#include <wand/MagickWand.h>
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -258,7 +258,7 @@ void TexMgr::loadNextImageFromDisk() {
+ 	ExceptionInfo exception;
+ 	int dirLoop = 0;
+ 
+-	GetExceptionInfo (&exception);
++	ClearMagickException (&exception);
+ 
+ 	int imageLoaded = 0;
+ 	do {
diff --git a/rss-glx.spec b/rss-glx.spec
index c779520..c6aae64 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 53%{?dist}
+Release: 54%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -35,6 +35,8 @@ Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
 Patch11: rss-glx-0.9.1.p-linker.patch
 Patch12: rss-glx-0.9.1.p-pixelcity.patch
 Patch13: rss-glx-gcc11.patch
+# Modified version from openSUSE: https://build.opensuse.org/package/view_file/X11:Utilities/rss-glx/rss-glx-ImageMagick7.patch?expand=1
+Patch14: rss-glx-ImageMagick7.patch
 
 BuildRequires: make
 BuildRequires:  gcc-c++
@@ -107,18 +109,13 @@ Build settings:
 %endif
 EOF
 
-%setup -q -n rss-glx_%{version}
-%patch0 -p1 -b .optflags
-%patch10 -p1 -b .autoreconf
-%patch11 -p1 -b .linker
-%patch12 -p1 -b .pixelcity
-%patch13 -p1 -b .gcc11
+%autosetup -p1 -n rss-glx_%{version}
 
 %build
 %configure \
     --with-configdir=%{xssconfigdir} \
     --program-prefix=rss-glx-
-make %{?_smp_mflags}
+%make_build
 
 %install
 install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
@@ -170,6 +167,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Sun Dec 04 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-54
+- Add patch for ImageMagick 7 compatibility
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-53
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 0c107fe8eb41d82597865de0835418adb2671285 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sun, 4 Dec 2022 20:06:08 -0500
Subject: [PATCH 87/96] Patch pregenerated configure script since regeneration
 fails

---
 rss-glx-ImageMagick7-configure.patch | 230 +++++++++++++++++++++++++++
 rss-glx.spec                         |   7 +-
 2 files changed, 236 insertions(+), 1 deletion(-)
 create mode 100644 rss-glx-ImageMagick7-configure.patch

diff --git a/rss-glx-ImageMagick7-configure.patch b/rss-glx-ImageMagick7-configure.patch
new file mode 100644
index 0000000..aa6ad18
--- /dev/null
+++ b/rss-glx-ImageMagick7-configure.patch
@@ -0,0 +1,230 @@
+diff '--color=auto' -rup rss-glx_0.9.1.p-orig/configure rss-glx_0.9.1.p/configure
+--- rss-glx_0.9.1.p-orig/configure	2022-12-04 19:48:00.239307236 -0500
++++ rss-glx_0.9.1.p/configure	2022-12-04 19:51:49.287547331 -0500
+@@ -621,8 +621,8 @@ freealut_LIBS
+ freealut_CFLAGS
+ WITHSOUND_FALSE
+ WITHSOUND_TRUE
+-Wand_LIBS
+-Wand_CFLAGS
++MagickWand_LIBS
++MagickWand_CFLAGS
+ PKG_CONFIG_LIBDIR
+ PKG_CONFIG_PATH
+ PKG_CONFIG
+@@ -777,8 +777,8 @@ XMKMF
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+-Wand_CFLAGS
+-Wand_LIBS
++MagickWand_CFLAGS
++MagickWand_LIBS
+ freealut_CFLAGS
+ freealut_LIBS
+ quesoglc_CFLAGS
+@@ -1443,8 +1443,8 @@ Some influential environment variables:
+               directories to add to pkg-config's search path
+   PKG_CONFIG_LIBDIR
+               path overriding pkg-config's built-in search path
+-  Wand_CFLAGS C compiler flags for Wand, overriding pkg-config
+-  Wand_LIBS   linker flags for Wand, overriding pkg-config
++  MagickWand_CFLAGS C compiler flags for MagickWand, overriding pkg-config
++  MagickWand_LIBS   linker flags for MagickWand, overriding pkg-config
+   freealut_CFLAGS
+               C compiler flags for freealut, overriding pkg-config
+   freealut_LIBS
+@@ -16124,35 +16124,35 @@ $as_echo "no" >&6; }
+ fi
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Wand" >&5
+-$as_echo_n "checking for Wand... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MagickWand" >&5
++$as_echo_n "checking for MagickWand... " >&6; }
+ 
+-if test -n "$Wand_CFLAGS"; then
+-    pkg_cv_Wand_CFLAGS="$Wand_CFLAGS"
++if test -n "$MagickWand_CFLAGS"; then
++    pkg_cv_MagickWand_CFLAGS="$MagickWand_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.4\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "Wand >= 6.4") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.4\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.4") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_Wand_CFLAGS=`$PKG_CONFIG --cflags "Wand >= 6.4" 2>/dev/null`
++  pkg_cv_MagickWand_CFLAGS=`$PKG_CONFIG --cflags "MagickWand >= 6.4" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+  else
+     pkg_failed=untried
+ fi
+-if test -n "$Wand_LIBS"; then
+-    pkg_cv_Wand_LIBS="$Wand_LIBS"
++if test -n "$MagickWand_LIBS"; then
++    pkg_cv_MagickWand_LIBS="$MagickWand_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.4\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "Wand >= 6.4") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.4\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.4") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_Wand_LIBS=`$PKG_CONFIG --libs "Wand >= 6.4" 2>/dev/null`
++  pkg_cv_MagickWand_LIBS=`$PKG_CONFIG --libs "MagickWand >= 6.4" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -16172,22 +16172,22 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        Wand_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "Wand >= 6.4" 2>&1`
++	        MagickWand_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "MagickWand >= 6.4" 2>&1`
+         else
+-	        Wand_PKG_ERRORS=`$PKG_CONFIG --print-errors "Wand >= 6.4" 2>&1`
++	        MagickWand_PKG_ERRORS=`$PKG_CONFIG --print-errors "MagickWand >= 6.4" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+-	echo "$Wand_PKG_ERRORS" >&5
++	echo "$MagickWand_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (Wand >= 6.4) were not met:
++	as_fn_error $? "Package requirements (MagickWand >= 6.4) were not met:
+ 
+-$Wand_PKG_ERRORS
++$MagickWand_PKG_ERRORS
+ 
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-Alternatively, you may set the environment variables Wand_CFLAGS
+-and Wand_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables MagickWand_CFLAGS
++and MagickWand_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+ 
+ elif test $pkg_failed = untried; then
+@@ -16199,16 +16199,16 @@ as_fn_error $? "The pkg-config script co
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+-Alternatively, you may set the environment variables Wand_CFLAGS
+-and Wand_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables MagickWand_CFLAGS
++and MagickWand_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+ 
+ else
+-	Wand_CFLAGS=$pkg_cv_Wand_CFLAGS
+-	Wand_LIBS=$pkg_cv_Wand_LIBS
++	MagickWand_CFLAGS=$pkg_cv_MagickWand_CFLAGS
++	MagickWand_LIBS=$pkg_cv_MagickWand_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+diff '--color=auto' -rup rss-glx_0.9.1.p-orig/Makefile.in rss-glx_0.9.1.p/Makefile.in
+--- rss-glx_0.9.1.p-orig/Makefile.in	2022-12-04 19:48:00.246307213 -0500
++++ rss-glx_0.9.1.p/Makefile.in	2022-12-04 19:57:46.709369115 -0500
+@@ -171,8 +171,8 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-Wand_CFLAGS = @Wand_CFLAGS@
+-Wand_LIBS = @Wand_LIBS@
++MagickWand_CFLAGS = @MagickWand_CFLAGS@
++MagickWand_LIBS = @MagickWand_LIBS@
+ XMKMF = @XMKMF@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/Implicit/Makefile.in rss-glx_0.9.1.p/src/Implicit/Makefile.in
+--- rss-glx_0.9.1.p-orig/src/Implicit/Makefile.in	2022-12-04 19:48:00.246307213 -0500
++++ rss-glx_0.9.1.p/src/Implicit/Makefile.in	2022-12-04 19:56:27.070631528 -0500
+@@ -159,8 +159,8 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-Wand_CFLAGS = @Wand_CFLAGS@
+-Wand_LIBS = @Wand_LIBS@
++MagickWand_CFLAGS = @MagickWand_CFLAGS@
++MagickWand_LIBS = @MagickWand_LIBS@
+ XMKMF = @XMKMF@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in
+--- rss-glx_0.9.1.p-orig/src/Makefile.in	2022-12-04 19:48:00.258307174 -0500
++++ rss-glx_0.9.1.p/src/Makefile.in	2022-12-04 19:55:53.893740843 -0500
+@@ -348,8 +348,8 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-Wand_CFLAGS = @Wand_CFLAGS@
+-Wand_LIBS = @Wand_LIBS@
++MagickWand_CFLAGS = @MagickWand_CFLAGS@
++MagickWand_LIBS = @MagickWand_LIBS@
+ XMKMF = @XMKMF@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -423,8 +423,8 @@ colorfire_LDADD = @BZIP2@
+ cyclone_SOURCES = driver.c cyclone.cpp rgbhsl.h rgbhsl.cpp rsRand.h
+ cyclone_LDADD = -LrsMath -lrsMath
+ drempels_SOURCES = driver.h driver.c drempels.cpp gpoly.h gpoly.cpp TexMgr.h TexMgr.cpp rgbhsl.h rgbhsl.cpp noise1234.h noise1234.c
+-drempels_CXXFLAGS = @Wand_CFLAGS@
+-drempels_LDADD = @PTHREAD_LIBS@ @Wand_LIBS@
++drempels_CXXFLAGS = @MagickWand_CFLAGS@
++drempels_LDADD = @PTHREAD_LIBS@ @MagickWand_LIBS@
+ euphoria_SOURCES = driver.h driver.c euphoria.cpp euphoria_textures.h euphoria_textures.c rgbhsl.h rgbhsl.cpp
+ euphoria_LDADD = -LrsMath -lrsMath @BZIP2@
+ feedback_SOURCES = driver.c feedback.cpp rgbhsl.h rgbhsl.cpp
+diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/PixelCity/Makefile.in rss-glx_0.9.1.p/src/PixelCity/Makefile.in
+--- rss-glx_0.9.1.p-orig/src/PixelCity/Makefile.in	2022-12-04 19:48:00.248307207 -0500
++++ rss-glx_0.9.1.p/src/PixelCity/Makefile.in	2022-12-04 19:57:07.414498596 -0500
+@@ -169,8 +169,8 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-Wand_CFLAGS = @Wand_CFLAGS@
+-Wand_LIBS = @Wand_LIBS@
++MagickWand_CFLAGS = @MagickWand_CFLAGS@
++MagickWand_LIBS = @MagickWand_LIBS@
+ XMKMF = @XMKMF@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/rsMath/Makefile.in rss-glx_0.9.1.p/src/rsMath/Makefile.in
+--- rss-glx_0.9.1.p-orig/src/rsMath/Makefile.in	2022-12-04 19:48:00.248307207 -0500
++++ rss-glx_0.9.1.p/src/rsMath/Makefile.in	2022-12-04 19:56:10.994684496 -0500
+@@ -167,8 +167,8 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-Wand_CFLAGS = @Wand_CFLAGS@
+-Wand_LIBS = @Wand_LIBS@
++MagickWand_CFLAGS = @MagickWand_CFLAGS@
++MagickWand_LIBS = @MagickWand_LIBS@
+ XMKMF = @XMKMF@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+diff '--color=auto' -rup rss-glx_0.9.1.p-orig/utils/Makefile.in rss-glx_0.9.1.p/utils/Makefile.in
+--- rss-glx_0.9.1.p-orig/utils/Makefile.in	2022-12-04 19:48:00.248307207 -0500
++++ rss-glx_0.9.1.p/utils/Makefile.in	2022-12-04 19:57:23.374446007 -0500
+@@ -139,8 +139,8 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-Wand_CFLAGS = @Wand_CFLAGS@
+-Wand_LIBS = @Wand_LIBS@
++MagickWand_CFLAGS = @MagickWand_CFLAGS@
++MagickWand_LIBS = @MagickWand_LIBS@
+ XMKMF = @XMKMF@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
diff --git a/rss-glx.spec b/rss-glx.spec
index c6aae64..d10bf7b 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 54%{?dist}
+Release: 55%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -37,6 +37,8 @@ Patch12: rss-glx-0.9.1.p-pixelcity.patch
 Patch13: rss-glx-gcc11.patch
 # Modified version from openSUSE: https://build.opensuse.org/package/view_file/X11:Utilities/rss-glx/rss-glx-ImageMagick7.patch?expand=1
 Patch14: rss-glx-ImageMagick7.patch
+# Autotools regeneration doesn't work
+Patch15: rss-glx-ImageMagick7-configure.patch
 
 BuildRequires: make
 BuildRequires:  gcc-c++
@@ -167,6 +169,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Mon Dec 05 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-55
+- Patch pregenerated configure script since regeneration fails
+
 * Sun Dec 04 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-54
 - Add patch for ImageMagick 7 compatibility
 

From a04a12cf4742047face01803729c3a77c09907a2 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Thu, 5 Jan 2023 06:56:11 -0500
Subject: [PATCH 88/96] Rebuild for ImageMagick 7

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index d10bf7b..cdade1f 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 55%{?dist}
+Release: 56%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -169,6 +169,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Thu Jan 05 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-56
+- Rebuild for ImageMagick 7
+
 * Mon Dec 05 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-55
 - Patch pregenerated configure script since regeneration fails
 

From 8297af6211f6f331d0ee20320715e83f6e72a204 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 20 Jan 2023 20:00:41 +0000
Subject: [PATCH 89/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index cdade1f..cbf8ac0 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -169,6 +169,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-57
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Jan 05 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-56
 - Rebuild for ImageMagick 7
 

From 67f06bd2b40391c3fff74b9ba4bf28f7cac9f76a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jul 2023 17:09:14 +0000
Subject: [PATCH 90/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index cbf8ac0..95f5101 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 57%{?dist}
+Release: 58%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -169,6 +169,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-58
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-57
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From b0eb3ee47dde64d9790ab331fbf8e828900a62ec Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 12:06:50 +0000
Subject: [PATCH 91/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 95f5101..1cd3cc3 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 58%{?dist}
+Release: 59%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -169,6 +169,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-59
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-58
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From cf1543e84b6d5f99f809864aa250d494b08bd091 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jan 2024 16:24:54 +0000
Subject: [PATCH 92/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 1cd3cc3..eb1558e 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 59%{?dist}
+Release: 60%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -169,6 +169,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-60
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-59
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From d8bb79f55f5ff5e3e930e44297bbb21ea70d1b68 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 18:53:20 +0000
Subject: [PATCH 93/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index eb1558e..73fc16c 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 60%{?dist}
+Release: 61%{?dist}
 License: GPLv2
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
@@ -169,6 +169,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-61
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-60
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 27062a47cffe6330134166654cf647fafe2f970f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Mon, 29 Jul 2024 12:08:44 +0200
Subject: [PATCH 94/96] convert GPLv2 license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 rss-glx.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index 73fc16c..ba4fa3e 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,8 +16,9 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 61%{?dist}
-License: GPLv2
+Release: 62%{?dist}
+# Automatically converted from old format: GPLv2 - review is highly recommended.
+License: GPL-2.0-only
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
 # The original URL is the following without %%patchext:
@@ -169,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 0.9.1.p-62
+- convert license to SPDX
+
 * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-61
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 947eb392a7ede519718c9c8e8a8da0a66ae70e46 Mon Sep 17 00:00:00 2001
From: josef radinger <cheese@nosuchhost.net>
Date: Fri, 17 Jan 2025 14:32:45 +0100
Subject: [PATCH 95/96] rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index ba4fa3e..bdf9fd9 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 62%{?dist}
+Release: 63%{?dist}
 # Automatically converted from old format: GPLv2 - review is highly recommended.
 License: GPL-2.0-only
 URL: http://rss-glx.sourceforge.net/
@@ -170,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Fri Jan 17 2025 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-63
+- rebuild for broken dependency on libMagickWand
+
 * Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 0.9.1.p-62
 - convert license to SPDX
 

From 4173833943ffc13370b1605f53b09323f08825e2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 12:09:08 +0000
Subject: [PATCH 96/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 rss-glx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rss-glx.spec b/rss-glx.spec
index bdf9fd9..ed2add2 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -16,7 +16,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 63%{?dist}
+Release: 64%{?dist}
 # Automatically converted from old format: GPLv2 - review is highly recommended.
 License: GPL-2.0-only
 URL: http://rss-glx.sourceforge.net/
@@ -170,6 +170,9 @@ fi
 %{xssbindir}/*
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-64
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Fri Jan 17 2025 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-63
 - rebuild for broken dependency on libMagickWand