rpms/kdeartwork/F-9 kdeartwork.spec,1.78,1.79

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdeartwork.spec 
Log Message:
* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.5-2
- omit crystalsvg icons for now


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/kdeartwork.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdeartwork.spec	1 Jun 2008 19:03:38 -0000	1.78
+++ kdeartwork.spec	4 Jun 2008 23:20:56 -0000	1.79
@@ -1,7 +1,7 @@
 
 Name:           kdeartwork
 Version:        4.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -16,6 +16,12 @@
 %define rest 1
 #endif
 
+# 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:  cmake
 BuildRequires:  kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -31,6 +37,7 @@
 %description
 Additional artwork (themes, sound themes, screensavers ...) for KDE.
 
+%if 0%{?include_crystalsvg}
 %package -n crystalsvg-icon-theme
 Summary: The crystalsvg icon theme
 Group: User Interface/Desktops
@@ -41,6 +48,7 @@
 %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
 
 %package icons
 Summary: Additional icon themes
@@ -107,6 +115,9 @@
 
 %if 0%{?icons}
 make install DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
+%if ! 0%{?include_crystalsvg}
+rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg/
+%endif
 %else
 rm -rf %{buildroot}%{_kde4_iconsdir}/
 %endif
@@ -124,8 +135,10 @@
 %{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || :
 
+%if 0%{?include_crystalsvg}
 %post -n crystalsvg-icon-theme
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
+%endif
 
 %postun icons
 %{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || :
@@ -134,9 +147,11 @@
 %{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || :
 
+%if 0%{?include_crystalsvg}
 %postun -n crystalsvg-icon-theme
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 %endif
+%endif
 
 
 %if 0%{?rest}
@@ -169,13 +184,18 @@
 %{_kde4_iconsdir}/kids/
 %{_kde4_iconsdir}/slick/
 
+%if 0%{?include_crystalsvg}
 %files -n crystalsvg-icon-theme 
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/crystalsvg/
 %endif
+%endif
 
 
 %changelog
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.5-2
+- omit crystalsvg icons for now
+
 * Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-1
 - 4.0.5