rpms/kdeartwork/devel kdeartwork.spec,1.106,1.107

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28591

Modified Files:
	kdeartwork.spec 
Log Message:
drop crystalsvg crud, no longer included here
kdeclassic not installed (by default)
+nuvola-icon-theme



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- kdeartwork.spec	13 May 2009 12:08:53 -0000	1.106
+++ kdeartwork.spec	17 May 2009 16:51:43 -0000	1.107
@@ -9,12 +9,6 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# We currently don't ship crystalsvg from kdeartwork because the actions have
-# been partially renamed to KDE 4 names, making the theme useless for KDE 3 apps
-# and yet not yet useful for KDE 4.
-# TODO: Revisit this issue once the renaming is complete. -- Kevin
-#define include_crystalsvg 1
-
 BuildRequires:  eigen2-devel
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -27,22 +21,23 @@ Requires: %{name}-sounds = %{version}-%{
 Requires: %{name}-wallpapers = %{version}-%{release}
 %endif
 
+%if ! 0%{?kdeclassic_icons}
+Obsoletes: kdeclassic-icon-theme < %{version}%{release}
+Obsoletes: kdeartwork-icons < 4.2.2-3
+%endif
+
 %description
 %{summary}, including additional styles, themes.
 
-%if 0%{?include_crystalsvg}
-%package -n crystalsvg-icon-theme
-Summary: The crystalsvg icon theme
+%package -n nuvola-icon-theme
+Summary: Nuvola icon theme
 Group: User Interface/Desktops
-Obsoletes: kdeartwork-icons-crystalsvg < %{version}-%{release}
-Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
+%endif
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
-%description -n crystalsvg-icon-theme
-This package contains the crystalsvg icon theme.
-It was the standard theme in KDE3 and is needed for KDE3 applications.
-%endif
+%description -n nuvola-icon-theme
+%{summary}.
 
 %package -n kdeclassic-icon-theme 
 Summary: KDE classic icon theme 
@@ -122,6 +117,7 @@ rm -rf %{buildroot}%{_kde4_iconsdir}/cry
 rm -rf %{buildroot}
 
 
+%if 0%{?kdeclassic_icons}
 %post -n kdeclassic-icon-theme 
 touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
@@ -133,19 +129,19 @@ if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 fi
+%endif
 
-%if 0%{?include_crystalsvg}
-%post -n crystalsvg-icon-theme
-touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+%post -n nuvola-icon-theme
+touch --no-create %{_kde4_iconsdir}/nuvola &> /dev/null || :
 
-%posttrans -n crystalsvg-icon-theme
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+%posttrans -n nuvola-icon-theme 
+gtk-update-icon-cache %{_kde4_iconsdir}/nuvola-icon-theme &> /dev/null || :
 
-%postun -n crystalsvg-icon-theme
+%postun -n novola-icon-theme 
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-%endif
+touch --no-create %{_kde4_iconsdir}/nuvola &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/nuvola &> /dev/null || :
+fi
 
 
 %files
@@ -158,15 +154,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/styles/*.so
 
-%if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme
+%if 0%{?kdeclassic_icons}
+%files -n kdeclassic-icon-theme 
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/crystalsvg/
+%{_kde4_iconsdir}/kdeclassic/
 %endif
 
-%files -n kdeclassic-icon-theme 
+%files -n nuvola-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/kdeclassic/
+%{_kde4_iconsdir}/nuvola/
 
 %files kxs
 %defattr(-,root,root,-)