rpms/kdepimlibs/devel kdepimlibs.spec,1.94,1.95

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20487

Modified Files:
	kdepimlibs.spec 
Log Message:
* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-3
- Conflicts: kdepim < 4.2.90



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- kdepimlibs.spec	25 Jul 2009 04:29:30 -0000	1.94
+++ kdepimlibs.spec	29 Jul 2009 20:38:33 -0000	1.95
@@ -12,7 +12,7 @@
 
 Name: kdepimlibs
 Version: 4.2.98
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -44,6 +44,9 @@ BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+# stuff moved kdepim -> kdepimlibs, help upgrade path
+Conflicts: kdepim < 6:4.2.90
+
 %description
 Personal Information Management (PIM) libraries for the
 K Desktop Environment 4.
@@ -210,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-3
+- Conflicts: kdepim < 4.2.90
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild