rpms/kdegraphics/devel kdegraphics.spec,1.176,1.177

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdegraphics.spec 
Log Message:
* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
- Obsoletes: libkdcraw libkexiv2 libkipi (F10+)
- cleanup Obsoletes: kdegraphics-extras



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- kdegraphics.spec	20 Nov 2008 15:11:20 -0000	1.176
+++ kdegraphics.spec	1 Dec 2008 22:47:35 -0000	1.177
@@ -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(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 @@
 %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: 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 @@
 
 
 %changelog
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
+- Obsoletes: libkdcraw libkexiv2 libkipi (F10+)
+- cleanup Obsoletes: kdegraphics-extras
+
 * Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
 - merged