rpms/kdeartwork/F-7 kdeartwork.spec,1.60,1.61

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5820

Modified Files:
	kdeartwork.spec 
Log Message:
* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.8-2
- include xscreensaver bits only in -extras (#253201)



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-7/kdeartwork.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdeartwork.spec	25 Oct 2007 12:58:31 -0000	1.60
+++ kdeartwork.spec	6 Dec 2007 20:52:10 -0000	1.61
@@ -2,13 +2,12 @@
 ## Conditional build:
 %define _with_xscreensaver --with-xscreensaver
 
-%define debug 0
 %define final 1 
 
 Name:    kdeartwork
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 Version: 3.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -16,6 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
+# FIXME: this should go in kde-settings -- Rex
 Source1: webcollagerc
 
 BuildRequires: gettext
@@ -29,11 +29,10 @@
 
 # TODO: build this subpkg noarch
 %package icons
-Summary: icon themes (kdeclassic, slick ....) for KDE
+Summary: Icon themes (kdeclassic, slick ....) for KDE
 Group: User Interface/Desktops
 %description icons
-The kdeartwork-icons package contains icon themes (kdeclassic, slick ...)
-for KDE.
+%{summary}.
 
 %if "%{?_with_xscreensaver:1}" == "1"
 %package extras
@@ -44,7 +43,7 @@
 Requires:      xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
 %description extras
-The kdeartwork-extras contains xscreensaver-based screensavers.
+%{summary}.
 
 %package kxs
 Summary: Support for xscreensaver-based screensavers
@@ -58,24 +57,21 @@
 %prep
 %setup -q
 
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
   --disable-rpath \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
+  --enable-new-ldflags \
+  --disable-dependency-tracking \
+  --disable-debug --disable-warnings \
+  %{?final: --enable-final} \
   %{?_with_xscreensaver} %{!?_with_xscreensaver:--without-xscreensaver}
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -94,13 +90,13 @@
 done
 
 # File lists
-%find_lang kdeartwork || touch kdeartwork.lang
+%find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}$HTML_DIR ]; then
 for lang_dir in %{buildroot}$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> kdeartwork.lang
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
     # replace absolute symlinks with relative ones
     pushd $lang_dir
       for i in *; do
@@ -111,6 +107,17 @@
 done
 fi
 
+# kde vs xscreensaver based screensavers
+for screensaver in %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ; do
+  if [ `grep '^TryExec=xscreensaver' $screensaver` ]; then
+    echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}-extras.lang
+  else
+    echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}.lang
+  fi
+done
+
+
+
 %post icons
 for i in locolor ikons kdeclassic kids slick ; do
  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
@@ -126,7 +133,7 @@
 %clean
 rm -rf %{buildroot}
 
-%files -f kdeartwork.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc kwin-styles/smooth-blend/COPYING
 %doc rpmdocs/kworldclock
@@ -134,7 +141,6 @@
 %{_libdir}/kde3/plugins/styles/*
 %{_libdir}/kde3/*.so
 %{_libdir}/kde3/*.la
-%{_datadir}/applnk/System/ScreenSavers/*.desktop
 %{_datadir}/apps/kfiresaver/
 %{_datadir}/apps/kscreensaver/
 %{_datadir}/apps/kstyle/themes/*
@@ -154,9 +160,8 @@
 %{_datadir}/icons/slick/
 
 %if "%{?_with_xscreensaver:1}" == "1"
-%files extras
+%files extras -f %{name}-extras.lang
 %defattr(-,root,root,-)
-%{_datadir}/applnk/System/ScreenSavers/*.desktop
 %config(noreplace) %{_datadir}/config/*rc
 
 %files kxs
@@ -167,6 +172,9 @@
 
 
 %changelog
+* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.8-2
+- include xscreensaver bits only in -extras (#253201)
+
 * Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.8-1
 - kde-3.5.8