rpms/kdepim/F-7 kdepim.spec,1.130,1.131

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15435

Modified Files:
	kdepim.spec 
Log Message:
* Tue Nov 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5.20071013.ent
- compacting mbox shows empty folder (kde#146967, rh#352391)



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/kdepim.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdepim.spec	25 Oct 2007 10:01:01 -0000	1.130
+++ kdepim.spec	6 Nov 2007 22:15:07 -0000	1.131
@@ -30,9 +30,9 @@
 
 %if 0%{?ent_date} > 0
 Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-Release: 3.svn%{ent_date}.ent%{?dist}
+Release: 5.svn%{ent_date}.ent%{?dist}
 %else
-Release: 3%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 Source1: cr48-app-kandy.png
@@ -42,6 +42,10 @@
 Patch1: kdepim-3.4.0-kandy-icons.patch
 Patch2: kdepim-xdg_open.patch
 
+## upstream patches
+# http://bugs.kde.org/146967 , http://bugzilla.redhat.com/352391
+Patch200: kdepim-3.5.7-kde#146967.patch
+
 Provides: kdepim3 = %{version}-%{release}
 
 %if 0%{?libs}
@@ -127,6 +131,8 @@
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
@@ -142,6 +148,8 @@
 
 %patch2 -p1 -b .xdg_open
 
+%patch200 -p0 -b .kde#146967
+
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -264,6 +272,12 @@
 
 
 %changelog
+* Tue Nov 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5.20071013.ent
+- compacting mbox shows empty folder (kde#146967, rh#352391)
+
+* Wed Oct 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4.20071013.ent
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+
 * Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-3.20071013.ent
 - -libs: %%post/%%postun /sbin/ldconfig
 - -libs conditional (f8+)