rpms/kdepimlibs/F-9 kdepimlibs.spec,1.47,1.48

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32090

Modified Files:
	kdepimlibs.spec 
Log Message:
* Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2.1
- -devel: fix conflicts with kdepim(3)-devel (f9)



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdepimlibs.spec	16 Feb 2009 17:01:33 -0000	1.47
+++ kdepimlibs.spec	18 Feb 2009 16:42:29 -0000	1.48
@@ -16,7 +16,7 @@
 
 Name: kdepimlibs
 Version: 4.2.0
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -116,11 +116,20 @@
 for i in lib*.so
 do
   case "$i" in
+# conflicts with kdelibs3
     libkabc.so | libkresources.so)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
+%if 0%{?fedora} < 10
+# conflicts with kdepim3
+    libgpgme++.so | libkcal.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+%endif
   esac
 done
 popd
@@ -181,6 +190,9 @@
 
 
 %changelog
+* Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2.1
+- -devel: fix conflicts with kdepim(3)-devel (f9)
+
 * Mon Feb 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
 - multilib conflicts (#485659)
 - kde4/devel symlinks: blacklist only known conflicts