diff --git a/kdegraphics.spec b/kdegraphics.spec index 389dfca..4b0aee4 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,11 +1,14 @@ -%if 0%{?fedora} < 10 + +%if 0%{?fedora} > 9 +%define obsolete_kde3_kipi 1 +%else %define omit_kde3_conflicts 1 %endif Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.1.80 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -49,7 +52,7 @@ Requires: cups Requires(post): xdg-utils Requires(postun): xdg-utils -Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: kdegraphics-extras < 7:4.0.0 Obsoletes: gwenview < 2 Provides: gwenview = 2 @@ -66,7 +69,9 @@ Graphics applications, including %package libs Summary: Runtime libraries for %{name} Group: System Environment/Libraries -Obsoletes: %{name}-libs-extras < %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?obsolete_kde3_kipi} +Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0 +%endif %description libs %{summary}. @@ -80,7 +85,7 @@ Requires: kdelibs4-devel Requires: pkgconfig %if ! 0%{?omit_kde3_conflicts} Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0 -Provides: libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.4.0-2, libkipi-devel = 0.2.0-1 +Provides: libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.2.0-1 %endif %description devel %{summary}. @@ -175,6 +180,10 @@ rm -rf %{buildroot} %changelog +* Mon Dec 01 2008 Rex Dieter 4.1.80-3 +- Obsoletes: libkdcraw libkexiv2 libkipi (F10+) +- cleanup Obsoletes: kdegraphics-extras + * Thu Nov 20 2008 Than Ngo 4.1.80-2 - merged