rpms/kdeartwork/devel kdeartwork.spec,1.54,1.55

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8084

Modified Files:
	kdeartwork.spec 
Log Message:
* Fri May 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.6-3
- resurrect -kxs subpkg (see also #220704)



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdeartwork.spec	21 Mar 2007 13:26:17 -0000	1.54
+++ kdeartwork.spec	4 May 2007 16:34:42 -0000	1.55
@@ -1,14 +1,15 @@
+
+## Conditional build:
+%define _with_xscreensaver --with-xscreensaver
+
 %define debug 0
 %define final 0
 
 %define kdebase_epoch 6
 
-# fc7 
-%define xscreensaver 0
-
 Name: kdeartwork
 Version: 3.5.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -16,13 +17,10 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
+BuildRequires: gettext
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: libart_lgpl-devel
 
-%if %{xscreensaver}
-BuildRequires: xscreensaver-extras xscreensaver-gl-extras
-%endif
-
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 
 %description
@@ -32,24 +30,31 @@
 Summary: icon themes (kdeclassic, slick ....) for KDE
 Group: User Interface/Desktops
 Requires: %{name} = %{version}
-
 %description icons
 The kdeartwork-icons package contains icon themes (kdeclassic, slick ...)
 for KDE.
 
-%if %{xscreensaver}
+%if "%{?_with_xscreensaver:1}" == "1"
 %package extras
 Summary: Artwork Extras, including xscreensaver-based screensavers
 Group: Amusements/Graphics
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires: xscreensaver-extras xscreensaver-gl-extras
-Obsoletes: kdeartwork-kxs
-Provides: kdeartwork-kxs
-
+BuildRequires: xscreensaver-extras xscreensaver-gl-extras
+Requires:      xscreensaver-extras xscreensaver-gl-extras
+Requires: %{name}-kxs = %{version}-%{release}
 %description extras
 The kdeartwork-extras contains xscreensaver-based screensavers.
+
+%package kxs
+Summary: Support for xscreensaver-based screensavers
+Group: Amusements/Graphics
+Requires: xscreensaver-base
+%description kxs
+%{summary}.
 %endif
 
+
+
 %prep
 %setup -q
 
@@ -57,9 +62,9 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
+  --disable-rpath \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --enable-gcc-hidden-visibility \
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -67,12 +72,7 @@
 %if %{final}
    --enable-final \
 %endif
-%if %{xscreensaver}
-   --with-xscreensaver \
-%else
-   --without-xscreensaver \
-%endif
-   --disable-rpath
+  %{?_with_xscreensaver} %{!?_with_xscreensaver:--without-xscreensaver}
 
 make %{?_smp_mflags}
 
@@ -108,18 +108,14 @@
 
 %post icons
 for i in locolor ikons kdeclassic kids slick ; do
-  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
-  if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-  fi
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
 done
 
 %postun icons
 for i in locolor ikons kdeclassic kids slick ; do
-  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
-  if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
-  fi
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
 done
 
 %clean
@@ -152,15 +148,22 @@
 %{_datadir}/icons/Locolor/
 %{_datadir}/icons/slick/
 
-%if %{xscreensaver}
+%if "%{?_with_xscreensaver:1}" == "1"
 %files extras
 %defattr(-,root,root,-)
-%doc rpmdocs/kscreensaver/kxs*
 %{_datadir}/applnk/System/ScreenSavers/*.desktop
+
+%files kxs
+%defattr(-,root,root,-)
+%doc rpmdocs/kscreensaver/kxs*
 %{_bindir}/kxs*
 %endif
 
+
 %changelog
+* Fri May 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.6-3
+- resurrect -kxs subpkg (see also #220704)
+
 * Wed Mar 21 2007 Than Ngo <than at redhat.com> - 3.5.6-2.fc7
 - cleanup specfile