rpms/rss-glx/devel rss-glx.spec,1.25,1.26

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6501

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



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rss-glx.spec	3 Apr 2008 02:39:12 -0000	1.25
+++ rss-glx.spec	29 May 2008 09:02:07 -0000	1.26
@@ -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}
-%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
+%bcond_with modular_xss
+%endif
+%if %{fedora} >= 8
+# KDE4
+%bcond_without kde4
 %else
-%define modular_xss 0%{?_with_modular_xss:1}
+# 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 @@
 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
@@ -89,7 +91,7 @@
 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
@@ -105,7 +107,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
@@ -140,27 +142,32 @@
 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 +194,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%%%% *}"
@@ -227,7 +234,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}
@@ -247,7 +254,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.
@@ -261,7 +268,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
@@ -288,7 +295,7 @@
 %dir %{xssbindir}
 %{xssbindir}/*
 
-%if %gss
+%if %{with gss}
 %files gnome-screensaver
 %defattr(-, root, root)
 %dir %{_gssconfigdir}
@@ -303,6 +310,10 @@
 %{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
+
 * 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