rpms/kdelibs/devel kdelibs.spec,1.232,1.233

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Sep 1 17:41:07 UTC 2007


Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/devel

Modified Files:
	kdelibs.spec 
Log Message:
Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict (allows using the old /opt/kde4 versions for now)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- kdelibs.spec	23 Aug 2007 14:39:59 -0000	1.232
+++ kdelibs.spec	1 Sep 2007 17:40:35 -0000	1.233
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -164,7 +164,6 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
-Conflicts: kdelibs4-devel
 %if "%{name}" == "kdelibs"
 Obsoletes: kdelibs3-devel < %{version}-%{release}
 Provides:  kdelibs3-devel = %{version}-%{release}
@@ -522,6 +521,10 @@
 
 
 %changelog
+* Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
+- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
+  (allows using the old /opt/kde4 versions for now)
+
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-21
 - vcard30 patch (kde#115219,rh#253496)
 - -devel: restore awol Requires (< f8 only) (#253801)




More information about the fedora-extras-commits mailing list