From 667c1c66d34d26de4f30899e19b1bc95ac0f7756 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 21 Apr 2008 18:48:38 +0000 Subject: [PATCH 1/5] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From e54db3676096357f47fb1435c0ca27ce8fcddeb6 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 29 May 2008 10:06:33 +0000 Subject: [PATCH 2/5] 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) --- rss-glx.spec | 99 +++++++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/rss-glx.spec b/rss-glx.spec index f79eb2b..c358517 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 @@ -76,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 @@ -89,13 +92,13 @@ 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 Requires: xscreensaver-base < 1:5.03-3 %endif -%if %{?fedora}%{!fedora} >= 7 +%if 0%{?fedora} >= 7 Requires: xscreensaver-gl-base %endif @@ -105,7 +108,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 +143,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 +195,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%%%% *}" @@ -210,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 @@ -227,7 +235,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 +255,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 +269,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 +296,7 @@ fi %dir %{xssbindir} %{xssbindir}/* -%if %gss +%if %{with gss} %files gnome-screensaver %defattr(-, root, root) %dir %{_gssconfigdir} @@ -303,6 +311,11 @@ fi %{kdessconfigdir}/*.desktop %changelog +* Thu May 29 2008 Nils Philippsen 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 0.8.1.p-19 - -kde: drop Requires: kdebase (kdeartwork dep is enough) - fix %%kdessconfigdir for kde4 From 215d5f04d16dcd569412c205c54bbb38482b6c86 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 22 Dec 2008 17:08:31 +0000 Subject: [PATCH 3/5] use autoreconf to avoid using non-matching ltmain.sh correct KDE desktop files so that they work with KDE 4.1 remove encoding lines from desktop files as they're deprecated version 0.8.2.p remove obsolete freealut patch update flags, gcc43 patches --- .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 | 9 ++- rss-glx.spec | 61 ++++++++++++++----- sources | 2 +- 10 files changed, 124 insertions(+), 151 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 - #include - -+#include - #include - - #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 - #include - #include -+#include - - - 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 + #include + ++#include + #include + + #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..82c0e09 100644 --- a/rss-glx-rm-matrixview.sh +++ b/rss-glx-rm-matrixview.sh @@ -87,17 +87,16 @@ 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:' set -x -aclocal || exit 6 -automake || exit 7 -autoconf || exit 8 +rm -f config.guess config.sub ltmain.sh || : +autoreconf -i || exit 6 rm -rf autom4te.cache || : set +x diff --git a/rss-glx.spec b/rss-glx.spec index c358517..6fc4db2 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,13 +72,17 @@ BuildRequires: libXt-devel BuildRequires: xorg-x11-devel %endif BuildRequires: bzip2-devel -BuildRequires: openal-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. @@ -172,9 +175,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 @@ -184,7 +186,7 @@ for f in `find . -type l` ; do done %build -autoconf +autoreconf -i %configure \ --with-configdir=%{xssconfigdir} \ --with-kdessconfigdir=%{kdessconfigdir} \ @@ -203,7 +205,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 +219,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 +301,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 +328,18 @@ fi %{kdessconfigdir}/*.desktop %changelog +* Mon Dec 22 2008 Nils Philippsen 0.8.2.p-1 +- use autoreconf to avoid using non-matching ltmain.sh + +* Wed Dec 17 2008 Nils Philippsen +- 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 +- version 0.8.2.p +- remove obsolete freealut patch +- update flags, gcc43 patches + * Thu May 29 2008 Nils Philippsen 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..cf5fc5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17870ad88d3a61ace94c04cb7677ddbf rss-glx_0.8.1.p.tar.bz2 +f5c04adbb538a6d74ce50ef091428021 rss-glx_0.8.2.p.tar.bz2 From adb40f75bf73afc4251a90279dd6dd5ba4a74bbf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:47 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6f98632..021a433 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: rss-glx -# $Id$ +# $Id: Makefile,v 1.1 2006/05/29 10:52:19 nphilipp Exp $ 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 0a7888120430175b54263308505d8a05007429f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:41:14 +0000 Subject: [PATCH 5/5] 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 021a433..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rss-glx -# $Id: Makefile,v 1.1 2006/05/29 10:52:19 nphilipp Exp $ -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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9