diff --git a/kdelibs3.spec b/kdelibs3.spec index 4be075d..c52f971 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -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 @@ Name: kdelibs Epoch: 6 Obsoletes: kdelibs3 < %{version}-%{release} Provides: kdelibs3 = %{version}-%{release} -%define include_crystalsvg 1 %endif License: LGPLv2 @@ -175,7 +179,8 @@ Obsoletes: kdelibs-apidocs < 6:%{version}-%{release} %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 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Wed Jun 04 2008 Kevin Kofler 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 3.5.9-14 - revert kdeui symlink hack (there be dragons) - unbreak -apidocs, add %%check so this never ever happens again