commit rss-glx for openSUSE:Factory
Hello community,
here is the log from the commit of package rss-glx for openSUSE:Factory checked
in at 2019-12-13 12:05:12
Comparing /work/SRC/openSUSE:Factory/rss-glx (Old)
and /work/SRC/openSUSE:Factory/.rss-glx.new.4691 (New)
Package is "rss-glx"
Fri Dec 13 12:05:12 2019 rev:15 rq:756763 version:0.9.1
Changes:
--- /work/SRC/openSUSE:Factory/rss-glx/rss-glx.changes 2017-12-22
12:21:20.764461014 +0100
+++ /work/SRC/openSUSE:Factory/.rss-glx.new.4691/rss-glx.changes
2019-12-13 12:06:06.641362805 +0100
@@ -1,0 +2,5 @@
+Mon Dec 9 15:07:30 UTC 2019 - Christophe Giboudeaux
+
+- Remove the unneeded kde4-filesystem build requirement.
+
+---
Other differences:
--
++ rss-glx.spec ++
--- /var/tmp/diff_new_pack.EV3Zf0/_old 2019-12-13 12:06:07.121362624 +0100
+++ /var/tmp/diff_new_pack.EV3Zf0/_new 2019-12-13 12:06:07.121362624 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rss-glx
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,9 +20,9 @@
Version:0.9.1
Release:0
Summary:Really Slick Screensavers Port to GLX
-License:GPL-2.0 AND GPL-3.0
+License:GPL-2.0-only AND GPL-3.0-only
Group: Amusements/Toys/Screensavers
-Url:http://rss-glx.sourceforge.net/
+URL:http://rss-glx.sourceforge.net/
Source:
http://prdownloads.sourceforge.net/rss-glx/rss-glx_%{version}.tar.bz2
# PATCH-FIX-OPENSUSE
Patch0: rss-glx-optflags.patch
@@ -35,7 +35,6 @@
Patch1: rss-glx-ImageMagick7.patch
BuildRequires: Mesa-libGL-devel
BuildRequires: gcc-c++
-BuildRequires: kde4-filesystem
# directory ownership
BuildRequires: libX11-devel
BuildRequires: libXt-devel
commit rss-glx for openSUSE:Factory
Hello community,
here is the log from the commit of package rss-glx for openSUSE:Factory checked
in at 2017-12-22 12:20:37
Comparing /work/SRC/openSUSE:Factory/rss-glx (Old)
and /work/SRC/openSUSE:Factory/.rss-glx.new (New)
Package is "rss-glx"
Fri Dec 22 12:20:37 2017 rev:14 rq:559080 version:0.9.1
Changes:
--- /work/SRC/openSUSE:Factory/rss-glx/rss-glx.changes 2017-04-07
13:54:56.361641071 +0200
+++ /work/SRC/openSUSE:Factory/.rss-glx.new/rss-glx.changes 2017-12-22
12:21:20.764461014 +0100
@@ -1,0 +2,11 @@
+Thu Dec 21 12:31:19 UTC 2017 - mimi...@gmail.com
+
+- Fix license
+- Cleanup BuildRequires
+
+---
+Sun Dec 3 20:39:35 UTC 2017 - fab...@ritter-vogt.de
+
+- Drop dependency on kdebase4-workspace
+
+---
Other differences:
--
++ rss-glx.spec ++
--- /var/tmp/diff_new_pack.2dL9fw/_old 2017-12-22 12:21:21.528423764 +0100
+++ /var/tmp/diff_new_pack.2dL9fw/_new 2017-12-22 12:21:21.528423764 +0100
@@ -20,7 +20,7 @@
Version:0.9.1
Release:0
Summary:Really Slick Screensavers Port to GLX
-License:GPL-2.0
+License:GPL-2.0 AND GPL-3.0
Group: Amusements/Toys/Screensavers
Url:http://rss-glx.sourceforge.net/
Source:
http://prdownloads.sourceforge.net/rss-glx/rss-glx_%{version}.tar.bz2
@@ -33,30 +33,26 @@
# include MagickCore/MagickCore.h and MagickWand/MagickWand.h for
# ImageMagick-7 instead; the upstream seem to be dead anyway though
Patch1: rss-glx-ImageMagick7.patch
-BuildRequires: Mesa-devel
-BuildRequires: freealut-devel
+BuildRequires: Mesa-libGL-devel
BuildRequires: gcc-c++
-%if 0%{?suse_version} <= 1310
-BuildRequires: gnome-screensaver
-%endif
BuildRequires: kde4-filesystem
# directory ownership
-BuildRequires: kdebase4-workspace
+BuildRequires: libX11-devel
+BuildRequires: libXt-devel
BuildRequires: libtool
BuildRequires: openal-devel
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
-BuildRequires: xorg-x11-devel
BuildRequires: xscreensaver
BuildRequires: pkgconfig(ImageMagick)
+BuildRequires: pkgconfig(freealut)
BuildRequires: pkgconfig(glu)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Cool collection of 3D screensavers. Linux port of Really Slick Screensavers
%prep
-%setup -n %{name}_%{version}
+%setup -q -n %{name}_%{version}
%patch0
%patch1 -p1
@@ -65,15 +61,13 @@
%configure --disable-static \
--enable-shared \
--with-pic \
---with-configdir=/etc/xscreensaver \
- --with-kdessconfigdir="%{_kde4_servicesdir}/ScreenSavers" \
+--with-configdir=%{_sysconfdir}/xscreensaver \
--program-prefix="%{name}-"
make %{?_smp_mflags}
%install
%make_install
-%kde_post_install
-find %{buildroot} -name "*.la" -type f -print -delete
+find %{buildroot} -type f -name "*.la" -delete -print
#no -devel files here..
rm -rvf %{buildroot}%{_libdir}/*.so
@@ -88,25 +82,14 @@
done
popd
-# add prefix for desktop files
-pushd %{buildroot}%{_kde4_servicesdir}/ScreenSavers
-for i in `ls . -I rss-glx-*.desktop | sed "s/\.desktop//"` ; do
- mv ${i}.desktop rss-glx-${i}.desktop
- sed -i "s/${i}/rss-glx-${i}/" rss-glx-${i}.desktop
-done
-popd
-
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
%config %{_sysconfdir}/xscreensaver/*
%{_bindir}/*
%{_libdir}/lib*
%{_mandir}/*/*%{ext_man}
-%_kde4_servicesdir/ScreenSavers/*
%dir %{_libdir}/xscreensaver
%{_libdir}/xscreensaver/*
commit rss-glx for openSUSE:Factory
Hello community,
here is the log from the commit of package rss-glx for openSUSE:Factory checked
in at 2017-04-07 13:54:52
Comparing /work/SRC/openSUSE:Factory/rss-glx (Old)
and /work/SRC/openSUSE:Factory/.rss-glx.new (New)
Package is "rss-glx"
Fri Apr 7 13:54:52 2017 rev:13 rq:483128 version:0.9.1
Changes:
--- /work/SRC/openSUSE:Factory/rss-glx/rss-glx.changes 2014-10-16
18:16:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.rss-glx.new/rss-glx.changes 2017-04-07
13:54:56.361641071 +0200
@@ -1,0 +2,6 @@
+Mon Mar 27 12:05:41 UTC 2017 - pgaj...@suse.com
+
+- fix build with ImageMagick 7
+ + rss-glx-ImageMagick7.patch
+
+---
New:
rss-glx-ImageMagick7.patch
Other differences:
--
++ rss-glx.spec ++
--- /var/tmp/diff_new_pack.EGiAzG/_old 2017-04-07 13:54:57.333503789 +0200
+++ /var/tmp/diff_new_pack.EGiAzG/_new 2017-04-07 13:54:57.337503224 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rss-glx
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,14 @@
Url:http://rss-glx.sourceforge.net/
Source:
http://prdownloads.sourceforge.net/rss-glx/rss-glx_%{version}.tar.bz2
# PATCH-FIX-OPENSUSE
-Patch: rss-glx-optflags.patch
+Patch0: rss-glx-optflags.patch
+# patch should go upstream, but there is TODO: source files include
+# magick/MagickCore.h and wand/MagickWand.h. This works for us for
+# both ImageMagick-6 and ImageMagick-7 because we package wand/ and
+# magick/ symlinks of ImageMagick include dir, but files should
+# include MagickCore/MagickCore.h and MagickWand/MagickWand.h for
+# ImageMagick-7 instead; the upstream seem to be dead anyway though
+Patch1: rss-glx-ImageMagick7.patch
BuildRequires: Mesa-devel
BuildRequires: freealut-devel
BuildRequires: gcc-c++
@@ -50,7 +57,8 @@
%prep
%setup -n %{name}_%{version}
-%patch
+%patch0
+%patch1 -p1
%build
autoreconf -fiv
++ rss-glx-ImageMagick7.patch ++
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.0 +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
@@ -34,8 +34,8 @@ 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@
+matrixview_CFLAGS = @MagickWand_CFLAGS@
+matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @MagickWand_LIBS@
plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
pixelcity_SOURCES = driver.c
pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
Index: rss-glx_0.9.1/src/matrixview.c
===
--- rss-glx_0.9.1.orig/src/matrixview.c 2010-01-05 03:54:55.0 +0100
+++ rss-glx_0.9.1/src/matrixview.c 2017-03-27 13:52:50.828843964 +0200
@@ -84,8 +84,8 @@ float *pts;
float *texcoords;
unsigned char *colors;
-#include
-#include
+#include
+#include
#include
#include
#include
@@ -102,7 +102,7 @@ void loadNextImageFromDisk() {
ExceptionInfo exception;
int dirLoop =
commit rss-glx for openSUSE:Factory
Hello community,
here is the log from the commit of package rss-glx for openSUSE:Factory checked
in at 2014-10-16 18:14:53
Comparing /work/SRC/openSUSE:Factory/rss-glx (Old)
and /work/SRC/openSUSE:Factory/.rss-glx.new (New)
Package is rss-glx
Changes:
--- /work/SRC/openSUSE:Factory/rss-glx/rss-glx.changes 2012-09-20
15:48:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.rss-glx.new/rss-glx.changes 2014-10-16
18:16:50.0 +0200
@@ -1,0 +2,8 @@
+Wed Oct 15 23:26:30 UTC 2014 - i...@marguerite.su
+
+- fix boo#901450
+ * soft-link binaries from /usr/bin to %%{_libdir}/xscreensaver
+- use --program-prefix=rss-glx to distinguish from those
+ screensavers shipped by xscreensaver itself.
+
+---
Other differences:
--
++ rss-glx.spec ++
--- /var/tmp/diff_new_pack.j1j7HU/_old 2014-10-16 18:16:51.0 +0200
+++ /var/tmp/diff_new_pack.j1j7HU/_new 2014-10-16 18:16:51.0 +0200
@@ -1,9 +1,7 @@
#
# spec file for package rss-glx
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2009 Stephan Kulow
-# Copyright (c) 2010 Pascal Bleser
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,15 +23,21 @@
License:GPL-2.0
Group: Amusements/Toys/Screensavers
Url:http://rss-glx.sourceforge.net/
-Source0:
http://prdownloads.sourceforge.net/rss-glx/rss-glx_%{version}.tar.bz2
+Source:
http://prdownloads.sourceforge.net/rss-glx/rss-glx_%{version}.tar.bz2
# PATCH-FIX-OPENSUSE
-Patch0: rss-glx-optflags.patch
+Patch: rss-glx-optflags.patch
BuildRequires: Mesa-devel
+BuildRequires: freealut-devel
BuildRequires: gcc-c++
+%if 0%{?suse_version} = 1310
+BuildRequires: gnome-screensaver
+%endif
BuildRequires: kde4-filesystem
+# directory ownership
+BuildRequires: kdebase4-workspace
BuildRequires: libtool
BuildRequires: openal-devel
-BuildRequires: pkgconfig
+BuildRequires: pkg-config
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
BuildRequires: xscreensaver
@@ -45,13 +49,17 @@
Cool collection of 3D screensavers. Linux port of Really Slick Screensavers
%prep
-%setup0 -n %{name}_%{version}
-%patch0
+%setup -n %{name}_%{version}
+%patch
%build
autoreconf -fiv
-%configure --disable-static --enable-shared --with-pic \
- --with-configdir=/etc/xscreensaver
--with-kdessconfigdir=%{_kde4_servicesdir}/ScreenSavers
+%configure --disable-static \
+ --enable-shared \
+ --with-pic \
+--with-configdir=/etc/xscreensaver \
+ --with-kdessconfigdir=%{_kde4_servicesdir}/ScreenSavers \
+ --program-prefix=%{name}-
make %{?_smp_mflags}
%install
@@ -61,8 +69,24 @@
#no -devel files here..
rm -rvf %{buildroot}%{_libdir}/*.so
-%clean
-%{?buildroot:rm -rf %{buildroot}}
+# RPM don't need rss-glx_install.pl to be installed
+rm -rf %{buildroot}%{_bindir}/%{name}-%{name}_install.pl
+
+# FIX boo#901450
+mkdir -pv %{buildroot}%{_libdir}/xscreensaver
+pushd %{buildroot}%{_bindir}
+for i in `ls` ; do
+ ln -sf %{_bindir}/${i} %{buildroot}%{_libdir}/xscreensaver
+done
+popd
+
+# add prefix for desktop files
+pushd %{buildroot}%{_kde4_servicesdir}/ScreenSavers
+for i in `ls . -I rss-glx-*.desktop | sed s/\.desktop//` ; do
+ mv ${i}.desktop rss-glx-${i}.desktop
+ sed -i s/${i}/rss-glx-${i}/ rss-glx-${i}.desktop
+done
+popd
%post -p /sbin/ldconfig
@@ -70,10 +94,12 @@
%files
%defattr(-,root,root)
-%{_mandir}/*/*%{ext_man}
+%config %{_sysconfdir}/xscreensaver/*
%{_bindir}/*
%{_libdir}/lib*
-%config %{_sysconfdir}/xscreensaver/*
-%_kde4_servicesdir/ScreenSavers
+%{_mandir}/*/*%{ext_man}
+%_kde4_servicesdir/ScreenSavers/*
+%dir %{_libdir}/xscreensaver
+%{_libdir}/xscreensaver/*
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rss-glx for openSUSE:Factory
Hello community,
here is the log from the commit of package rss-glx for openSUSE:Factory checked
in at 2012-09-20 15:47:49
Comparing /work/SRC/openSUSE:Factory/rss-glx (Old)
and /work/SRC/openSUSE:Factory/.rss-glx.new (New)
Package is rss-glx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/rss-glx/rss-glx.changes 2011-11-28
12:57:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.rss-glx.new/rss-glx.changes 2012-09-20
15:48:04.0 +0200
@@ -1,0 +2,5 @@
+Thu Sep 20 09:09:16 UTC 2012 - co...@suse.com
+
+- add pkgconfig(glu) as explicit buildrequire
+
+---
Other differences:
--
++ rss-glx.spec ++
--- /var/tmp/diff_new_pack.ILxRbt/_old 2012-09-20 15:48:05.0 +0200
+++ /var/tmp/diff_new_pack.ILxRbt/_new 2012-09-20 15:48:05.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rss-glx
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 Stephan Kulow
# Copyright (c) 2010 Pascal Bleser
#
@@ -18,27 +18,27 @@
#
-
Name: rss-glx
Version:0.9.1
-Release:1
-License:GPL-2.0
+Release:0
Summary:Really Slick Screensavers Port to GLX
-Url:http://rss-glx.sourceforge.net/
+License:GPL-2.0
Group: Amusements/Toys/Screensavers
+Url:http://rss-glx.sourceforge.net/
Source0:
http://prdownloads.sourceforge.net/rss-glx/rss-glx_%{version}.tar.bz2
# PATCH-FIX-OPENSUSE
Patch0: rss-glx-optflags.patch
BuildRequires: Mesa-devel
BuildRequires: gcc-c++
BuildRequires: kde4-filesystem
+BuildRequires: libtool
BuildRequires: openal-devel
BuildRequires: pkgconfig
-BuildRequires: libtool
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
BuildRequires: xscreensaver
BuildRequires: pkgconfig(ImageMagick)
+BuildRequires: pkgconfig(glu)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rss-glx for openSUSE:Factory
Hello community, here is the log from the commit of package rss-glx for openSUSE:Factory checked in at 2011-11-28 12:56:52 Comparing /work/SRC/openSUSE:Factory/rss-glx (Old) and /work/SRC/openSUSE:Factory/.rss-glx.new (New) Package is rss-glx, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/rss-glx/rss-glx.changes 2011-09-23 12:44:45.0 +0200 +++ /work/SRC/openSUSE:Factory/.rss-glx.new/rss-glx.changes 2011-11-28 12:57:07.0 +0100 @@ -1,0 +2,11 @@ +Fri Nov 25 10:45:33 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +--- +Fri Nov 25 10:45:11 UTC 2011 - co...@suse.com + +- change the license to GPL-2.0 as that's what COPYING says and + I found at least one file without or later + +--- Other differences: -- ++ rss-glx.spec ++ --- /var/tmp/diff_new_pack.GvJWSM/_old 2011-11-28 12:57:08.0 +0100 +++ /var/tmp/diff_new_pack.GvJWSM/_new 2011-11-28 12:57:08.0 +0100 @@ -22,7 +22,7 @@ Name: rss-glx Version:0.9.1 Release:1 -License:GPL +License:GPL-2.0 Summary:Really Slick Screensavers Port to GLX Url:http://rss-glx.sourceforge.net/ Group: Amusements/Toys/Screensavers @@ -34,6 +34,7 @@ BuildRequires: kde4-filesystem BuildRequires: openal-devel BuildRequires: pkgconfig +BuildRequires: libtool BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel BuildRequires: xscreensaver -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rss-glx for openSUSE:Factory
Hello community,
here is the log from the commit of package rss-glx for openSUSE:Factory
checked in at Fri Sep 23 10:34:04 CEST 2011.
--- rss-glx/rss-glx.changes 2010-06-24 23:13:38.0 +0200
+++ /mounts/work_src_done/STABLE/rss-glx/rss-glx.changes2011-09-22
22:01:29.0 +0200
@@ -1,0 +2,11 @@
+Thu Sep 22 20:01:16 UTC 2011 - co...@suse.com
+
+- cleanup spec file
+
+---
+Fri Sep 2 20:29:06 UTC 2011 - crrodrig...@opensuse.org
+
+- Fix build with no-add-needed, just by not using static linking
+- Fix lack of optflags due to broken configure script
+
+---
calling whatdependson for head-i586
New:
rss-glx-optflags.patch
Other differences:
--
++ rss-glx.spec ++
--- /var/tmp/diff_new_pack.rydNWz/_old 2011-09-23 10:34:00.0 +0200
+++ /var/tmp/diff_new_pack.rydNWz/_new 2011-09-23 10:34:00.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package rss-glx (Version 0.9.1)
+# spec file for package rss-glx
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 Stephan Kulow
# Copyright (c) 2010 Pascal Bleser
#
@@ -18,42 +18,61 @@
#
-%{!?_kde4_servicesdir: %global _kde4_servicesdir %(kde4-config --install
services || echo KDE4-CONFIG-NOT-INSTALLED)}
Name: rss-glx
Version:0.9.1
Release:1
License:GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Group: Amusements/Toys/Screensavers
-BuildRequires: ImageMagick-devel Mesa-devel gcc-c++ kdelibs4-core
openal-devel pkgconfig update-desktop-files xorg-x11-devel xscreensaver
-Source0:
http://prdownloads.sourceforge.net/rss-glx/rss-glx_%{version}.tar.bz2
Summary:Really Slick Screensavers Port to GLX
Url:http://rss-glx.sourceforge.net/
+Group: Amusements/Toys/Screensavers
+Source0:
http://prdownloads.sourceforge.net/rss-glx/rss-glx_%{version}.tar.bz2
+# PATCH-FIX-OPENSUSE
+Patch0: rss-glx-optflags.patch
+BuildRequires: Mesa-devel
+BuildRequires: gcc-c++
+BuildRequires: kde4-filesystem
+BuildRequires: openal-devel
+BuildRequires: pkgconfig
+BuildRequires: update-desktop-files
+BuildRequires: xorg-x11-devel
+BuildRequires: xscreensaver
+BuildRequires: pkgconfig(ImageMagick)
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Cool collection of 3D screensavers. Linux port of Really Slick Screensavers
%prep
%setup0 -n %{name}_%{version}
+%patch0
%build
-%configure --with-configdir=/etc/xscreensaver
--with-kdessconfigdir=%{_kde4_servicesdir}/ScreenSavers
-%{__make} %{?jobs:-j%jobs}
+autoreconf -fiv
+%configure --disable-static --enable-shared --with-pic \
+ --with-configdir=/etc/xscreensaver
--with-kdessconfigdir=%{_kde4_servicesdir}/ScreenSavers
+make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
%kde_post_install
-%__rm -rf $RPM_BUILD_ROOT/%_libdir
+find %{buildroot} -name *.la -type f -print -delete
+#no -devel files here..
+rm -rvf %{buildroot}%{_libdir}/*.so
%clean
-%{?buildroot:%__rm -rf %{buildroot}}
+%{?buildroot:rm -rf %{buildroot}}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
-%_mandir/*/*%{ext_man}
-%_bindir/*
-%config /etc/xscreensaver/*
+%{_mandir}/*/*%{ext_man}
+%{_bindir}/*
+%{_libdir}/lib*
+%config %{_sysconfdir}/xscreensaver/*
%_kde4_servicesdir/ScreenSavers
%changelog
++ rss-glx-optflags.patch ++
--- configure.in.orig
+++ configure.in
@@ -11,9 +11,6 @@ AM_PROG_CC_C_O
AC_PROG_CC_C99
AC_C_BIGENDIAN
-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])
@@ -23,9 +20,6 @@ fi
AC_PROG_CXX
-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])
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
