rpms/rss-glx/F-8 rss-glx.spec,1.23,1.24
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Thu May 29 10:08:21 UTC 2008
Author: nphilipp
Update of /cvs/pkgs/rpms/rss-glx/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15360
Modified Files:
rss-glx.spec
Log Message:
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)
-kde: drop Requires: kdebase (kdeartwork dep is enough)
fix %kdessconfigdir for kde4
Fix build with gcc43
Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-8/rss-glx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rss-glx.spec 5 Nov 2007 11:22:43 -0000 1.23
+++ rss-glx.spec 29 May 2008 10:07:31 -0000 1.24
@@ -1,42 +1,50 @@
-%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
-
%if 0%{?fedora}
-%if "%{fedora}" <= "4"
-%define modular_x 0%{?_with_modular_x:1}
-%define gss 0
-%define _gssconfigdir %{nil}
-%else
-%define modular_x 0%{!?_without_modular_x:1}
-%define gss 1
-%if "%{fedora}" <= "5"
+%if %{fedora} <= 4
+%bcond_with modular_x
+%bcond_with gss
+%define _gssconfigdir %{nil}%{?gssconfigdir}
+%else
+%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: 17%{?dist}
+Release: 20%{?dist}
License: GPLv2
Group: Amusements/Graphics
URL: http://rss-glx.sourceforge.net/
@@ -49,13 +57,14 @@
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
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
@@ -69,6 +78,7 @@
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: gawk
+BuildRequires: sed
%description
A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -82,13 +92,13 @@
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
@@ -98,7 +108,7 @@
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
@@ -117,7 +127,6 @@
Group: Amusements/Graphics
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
@@ -134,32 +143,38 @@
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}
%patch0 -p1 -b .freealut
%patch1 -p1 -b .flags
+%patch2 -p1 -b .gcc43
# work around BZ #189928
for f in `find . -type l` ; do
@@ -180,7 +195,7 @@
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%%%% *}"
@@ -203,7 +218,7 @@
# 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 at g' > "${trycmd}.desktop"
rm -f "${origtrycmd}.desktop"
fi
popd >& /dev/null
@@ -220,7 +235,7 @@
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}
@@ -240,7 +255,7 @@
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.
@@ -254,7 +269,7 @@
%clean
rm -rf %buildroot
-%if %modular_xss
+%if %{with modular_xss}
%post xscreensaver
if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
%{_sbindir}/update-xscreensaver-hacks
@@ -281,7 +296,7 @@
%dir %{xssbindir}
%{xssbindir}/*
-%if %gss
+%if %{with gss}
%files gnome-screensaver
%defattr(-, root, root)
%dir %{_gssconfigdir}
@@ -296,6 +311,18 @@
%{kdessconfigdir}/*.desktop
%changelog
+* Thu May 29 2008 Nils Philippsen <nphilipp at 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 at fedoraproject.org> 0.8.1.p-19
+- -kde: drop Requires: kdebase (kdeartwork dep is enough)
+- fix %%kdessconfigdir for kde4
+
+* Fri Jan 31 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.8.1.p-18
+- Fix build with gcc43
+
* Mon Nov 05 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-17
- make screensavers show up in screensaver preferences again (#365991)
More information about the fedora-extras-commits
mailing list