rpms/kdepimlibs/devel kdepimlibs.spec,1.75,1.76
Rex Dieter
rdieter at fedoraproject.org
Tue Mar 3 20:32:27 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18913
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/devel/kdepimlibs.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdepimlibs.spec 27 Feb 2009 12:44:16 -0000 1.75
+++ kdepimlibs.spec 3 Mar 2009 20:31:57 -0000 1.76
@@ -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,6 +220,9 @@
%changelog
+* 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
More information about the scm-commits
mailing list