rpms/kdepimlibs/F-10 kdepimlibs.spec,1.61,1.62

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdepimlibs.spec 
Log Message:
* Tue Mar 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
- avoid libkcal conflict with kdepim3



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdepimlibs.spec	27 Feb 2009 18:08:09 -0000	1.61
+++ kdepimlibs.spec	5 Mar 2009 02:54:47 -0000	1.62
@@ -17,7 +17,7 @@
 
 Name: kdepimlibs
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -139,9 +139,14 @@
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
+# conflicts with kdepim3 (compat)
+    libkcal.so)
+      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)
+# conflicts with kdepim(3)
+    libgpgme++.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
@@ -215,7 +220,10 @@
 
 
 %changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Tue Mar 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- avoid libkcal conflict with kdepim3
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-5