rpms/rss-glx/F-7 rss-glx.spec,1.8,1.9
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Sat Sep 15 08:32:03 UTC 2007
Author: nphilipp
Update of /cvs/pkgs/rpms/rss-glx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12052
Modified Files:
rss-glx.spec
Log Message:
enable modular xscreensaver support for Fedora 7 and later (#200881)
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 xscreensaver-base >= 5.03-3 for that
don't reference upstream URL for source tarball as we ship a modified one
implement revamped modular xscreensaver configuration (#200881)
require post/preun xscreensaver-base min/max EVR
don't let %preun fail
Buildrequire gawk.
build xscreensaver hack description files (#200881)
require %{_bindir}/kxsconfig (#219106)
Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-7/rss-glx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rss-glx.spec 28 Aug 2006 13:54:50 -0000 1.8
+++ rss-glx.spec 15 Sep 2007 08:31:31 -0000 1.9
@@ -1,4 +1,5 @@
%define xssconfigdir %{_datadir}/xscreensaver/config
+%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
%define xssbindir %{_libexecdir}/xscreensaver
%define gssbindir %{_libexecdir}/gnome-screensaver
%define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers
@@ -16,9 +17,15 @@
%else
%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
%endif
+%if "%{fedora}" >= "7"
+%define modular_xss 0%{?!_without_modular_xss:1}
+%else
+%define modular_xss 0%{?_with_modular_xss:1}
+%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}
%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
%endif
@@ -29,11 +36,14 @@
Summary: Really Slick Screensavers
Name: rss-glx
Version: 0.8.1%{patchext}
-Release: 6%{?dist}
-License: GPL
+Release: 11%{?dist}
+License: GPLv2
Group: Amusements/Graphics
URL: http://rss-glx.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# 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: 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
@@ -42,11 +52,11 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-%if %modular_x
-BuildRequires: libICE-devel
%if %with_matrixview
BuildRequires: ImageMagick-devel >= 6.2.5.4
%endif
+%if %modular_x
+BuildRequires: libICE-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXt-devel
@@ -58,6 +68,7 @@
BuildRequires: freealut-devel
BuildRequires: autoconf
BuildRequires: libtool
+BuildRequires: gawk
%description
A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -71,7 +82,12 @@
Summary: Really Slick Screensavers
Group: Amusements/Graphics
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: xscreensaver-base
+%if %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
%description xscreensaver
A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -99,6 +115,11 @@
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdebase
+%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
@@ -175,7 +196,11 @@
awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${trycmd}.desktop.orig" > "${trycmd}.desktop"
rm -f "${trycmd}.desktop.orig"
popd >& /dev/null
- # symlinks for XScreenSaver
+ # 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
}
@@ -188,6 +213,7 @@
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§This is an attempt to recreate some of the work of William Latham.
@@ -217,6 +243,16 @@
%clean
rm -rf %buildroot
+%post xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+ %{_sbindir}/update-xscreensaver-hacks
+fi
+
+%postun xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+ %{_sbindir}/update-xscreensaver-hacks || :
+fi
+
%files
%defattr(-, root, root)
%doc ChangeLog COPYING INSTALL README README.xscreensaver
@@ -226,6 +262,8 @@
%files xscreensaver
%defattr(-, root, root)
+# xscreensaver-base provides %{xssexthacksconfdir}
+%config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
%{xssconfigdir}/*.xml
%dir %{xssbindir}
%{xssbindir}/*
@@ -245,6 +283,32 @@
%{kdessconfigdir}/*.desktop
%changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
+- enable modular xscreensaver support for Fedora 7 and later (#200881)
+
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
+- 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
+ xscreensaver-base >= 5.03-3 for that
+- don't reference upstream URL for source tarball as we ship a modified one
+
+* Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
+- implement revamped modular xscreensaver configuration (#200881)
+- require post/preun xscreensaver-base min/max EVR
+- don't let %%preun fail
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-9
+- Buildrequire gawk.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-8
+- Rebuild for selinux ppc32 issue.
+
+* Thu Jun 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-7
+- build xscreensaver hack description files (#200881)
+- require %{_bindir}/kxsconfig (#219106)
+
* Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-6
- FC6 mass rebuild
More information about the scm-commits
mailing list