From 79da12db5f6c1d2dd76f45a84050b71b2573de45 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jul 21 2008 17:39:18 +0000
Subject: - omit conflicting lib{kexiv2,kdcraw,kipi}-devel bits in F-9 builds

    (#452392)

---

diff --git a/kdegraphics.spec b/kdegraphics.spec
index 089db36..38d150a 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -1,8 +1,12 @@
 
+%if 0%{?fedora} < 10
+%define omit_kde3_conflicts 1
+%endif
+
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.0.99
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 Obsoletes:      kdegraphics4 < %{version}-%{release}
@@ -42,8 +46,8 @@ BuildRequires:  lcms-devel
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-# okular requires lpr (provided by cups)
-Requires: lpr
+# okular requires lpr.cups (provided by cups)
+Requires: cups 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -77,8 +81,12 @@ Obsoletes: kdegraphics4-devel < %{version}-%{release}
 Provides:  kdegraphics4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: pkgconfig
-## FIXME: pkgconfig and lib -devel symlinks -- Rex
+%if ! 0%{?omit_kde3_conflicts}
+## FIXME: handle upgrade path for F-10 -- Rex 
 Conflicts: libkexiv2-devel libkdcraw-devel libkipi-devel
+#Obsoletes: libkexiv2-devel libkdcraw-devel libkipi-devel
+#Provides:  libkexiv2-devel libkdcraw-devel libkipi-devel 
+%endif
 %description devel
 %{summary}.
 
@@ -102,10 +110,18 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?omit_kde3_conflicts}
+# Conflicts: libkexiv2-devel libkdcraw-devel libkipi-devel
+rm -rf %{buildroot}%{_kde4_includedir}/lib{kexiv2,kdcraw,kipi}/
+rm -f  %{buildroot}%{_kde4_libdir}/lib{kexiv2,kdcraw,kipi}.so
+rm -f  %{buildroot}%{_libdir}/pkgconfig/lib{kexiv2,kdcraw,kipi}.pc
+%endif
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %post
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
@@ -155,9 +171,11 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
+%if ! 0%{?omit_kde3_conflicts}
 %{_kde4_includedir}/libkdcraw/
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
+%endif
 %{_kde4_includedir}/libksane/
 %{_kde4_includedir}/okular/
 %{_kde4_libdir}/lib*.so
@@ -167,6 +185,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 21 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.99-2
+- omit conflicting lib{kexiv2,kdcraw,kipi}-devel bits in F-9 builds (#452392)
+
 * Fri Jul 18 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.99-1
 - 4.0.99