rpms/kdelibs3/F-9 kdelibs3.spec,1.28,1.29

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdelibs3.spec 
Log Message:
* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-15
- set include_crystalsvg to 1 everywhere
- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/kdelibs3.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kdelibs3.spec	3 Jun 2008 22:28:25 -0000	1.28
+++ kdelibs3.spec	4 Jun 2008 21:45:39 -0000	1.29
@@ -22,9 +22,14 @@
 
 %define apidocs 1
 
+# We always include this here now because kdeartwork 4 has moved on to
+# icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
+# yet either). Maybe the conditional should be dropped entirely? -- Kevin
+%define include_crystalsvg 1
+
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -37,7 +42,6 @@
 Epoch: 6
 Obsoletes: kdelibs3 < %{version}-%{release}
 Provides: kdelibs3 = %{version}-%{release}
-%define include_crystalsvg 1
 %endif
 
 License: LGPLv2
@@ -175,7 +179,8 @@
 %endif
 
 %if 0%{?include_crystalsvg}
-Provides: crystalsvg-icon-theme = %{version}-%{release}
+Provides: crystalsvg-icon-theme = 1:%{version}-%{release}
+Obsoletes: crystalsvg-icon-theme < 1:%{version}-%{release}
 %else
 # for bootstrapping kde3, omit Requires: crystalsvg... -- Rex
 Requires: crystalsvg-icon-theme
@@ -610,6 +615,10 @@
 
 
 %changelog
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-15
+- set include_crystalsvg to 1 everywhere
+- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes
+
 * Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-14
 - revert kdeui symlink hack (there be dragons) 
 - unbreak -apidocs, add %%check so this never ever happens again