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

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeartwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8863

Modified Files:
	kdeartwork.spec 
Log Message:
cleanup



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdeartwork.spec	7 Feb 2007 22:42:16 -0000	1.53
+++ kdeartwork.spec	21 Mar 2007 13:26:17 -0000	1.54
@@ -1,18 +1,14 @@
 %define debug 0
 %define final 0
 
-%define make_cvs 1
-
-%define qt_version 3.3.7
-%define arts_version 1.5.6
-%define kdelibs_epoch 6
 %define kdebase_epoch 6
-%define qt_epoch 1
-%define arts 1
+
+# fc7 
+%define xscreensaver 0
 
 Name: kdeartwork
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -20,19 +16,17 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-BuildRequires: perl
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
-BuildRequires: arts-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: libart_lgpl-devel
+
+%if %{xscreensaver}
+BuildRequires: xscreensaver-extras xscreensaver-gl-extras
+%endif
 
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires: qt >= %{qt_epoch}:%{qt_version}
 
 %description
-Additional artwork (themes, sound themes, screensavers ...) for KDE
+Additional artwork (themes, sound themes, screensavers ...) for KDE.
 
 %package icons
 Summary: icon themes (kdeclassic, slick ....) for KDE
@@ -41,7 +35,20 @@
 
 %description icons
 The kdeartwork-icons package contains icon themes (kdeclassic, slick ...)
-for KDE
+for KDE.
+
+%if %{xscreensaver}
+%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
+
+%description extras
+The kdeartwork-extras contains xscreensaver-based screensavers.
+%endif
 
 %prep
 %setup -q
@@ -49,18 +56,10 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%if %{make_cvs}
-   make -f admin/Makefile.common cvs
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --with-qt-libraries=$QTDIR/lib \
    --enable-gcc-hidden-visibility \
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -68,6 +67,11 @@
 %if %{final}
    --enable-final \
 %endif
+%if %{xscreensaver}
+   --with-xscreensaver \
+%else
+   --without-xscreensaver \
+%endif
    --disable-rpath
 
 make %{?_smp_mflags}
@@ -77,10 +81,30 @@
 
 make install DESTDIR="%{buildroot}"
 
-mv %{buildroot}%{_datadir}/icons/Locolor %{buildroot}%{_datadir}/icons/locolor
+# rpmdocs
+for dir in IconThemes/* kworldclock kscreensaver/kxsconfig ; do
+  for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
 
-# fix file conflict with kdesdk package
-rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png
+# File lists
+%find_lang kdeartwork || touch kdeartwork.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
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
 
 %post icons
 for i in locolor ikons kdeclassic kids slick ; do
@@ -101,29 +125,45 @@
 %clean
 rm -rf %{buildroot}
 
-%files
-%defattr(-,root,root)
+%files -f kdeartwork.lang
+%defattr(-,root,root,-)
+%doc kwin-styles/smooth-blend/COPYING
+%doc rpmdocs/kworldclock
 %{_bindir}/*
 %{_libdir}/kde3/plugins/styles/*
+%{_libdir}/kde3/*.so
 %{_libdir}/kde3/*.la
-%{_libdir}/kde3/*.so*
-%{_datadir}/apps/kwin/icewm-themes
-%{_datadir}/apps/kwin/glow-themes
-%{_datadir}/apps/kwin/*.desktop
+%{_datadir}/applnk/System/ScreenSavers/*.desktop
+%{_datadir}/apps/kfiresaver/
+%{_datadir}/apps/kscreensaver/
 %{_datadir}/apps/kstyle/themes/*
+%{_datadir}/apps/kwin/*
+%{_datadir}/apps/kworldclock/
 %{_datadir}/sounds/*
-%{_datadir}/wallpapers
-%{_datadir}/apps/kscreensaver/*.png
-%{_datadir}/apps/kworldclock/maps/*
-%{_datadir}/apps/kfiresaver
-%{_datadir}/applnk/System/ScreenSavers/*.desktop
+%{_datadir}/wallpapers/*
 %{_datadir}/emoticons/*
 
 %files icons
-%defattr(-,root,root)
-%{_datadir}/icons/*
+%defattr(-,root,root,-)
+%doc rpmdocs/IconThemes/*
+%{_datadir}/icons/ikons/
+%{_datadir}/icons/kdeclassic/
+%{_datadir}/icons/kids/
+%{_datadir}/icons/Locolor/
+%{_datadir}/icons/slick/
+
+%if %{xscreensaver}
+%files extras
+%defattr(-,root,root,-)
+%doc rpmdocs/kscreensaver/kxs*
+%{_datadir}/applnk/System/ScreenSavers/*.desktop
+%{_bindir}/kxs*
+%endif
 
 %changelog
+* Wed Mar 21 2007 Than Ngo <than at redhat.com> - 3.5.6-2.fc7
+- cleanup specfile
+
 * Wed Feb 07 2007 han Ngo <than at redhat.com> 3.5.6-1.fc7
 - 3.5.6