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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rss-glx.new/rss-glx.changes 2014-10-16 18:16:50.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.j1j7HU/_new 2014-10-16 18:16:51.000000000 +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+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org