rpms/kdepim/F-7 kdepim.spec,1.123,1.124

[Than Ngo (than)]

Author: than

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

Modified Files:
	kdepim.spec 
Log Message:
3.5.7



Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-7/kdepim.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdepim.spec	11 May 2007 00:09:42 -0000	1.123
+++ kdepim.spec	6 Jun 2007 19:21:18 -0000	1.124
@@ -1,5 +1,5 @@
 %define debug 0
-%define final 0
+%define final 1
 
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
@@ -11,8 +11,8 @@
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
-Version: 3.5.6
-Release: 7%{?dist}
+Version: 3.5.7
+Release: 0.1%{?dist}
 
 Group: Applications/Productivity
 License: GPL
@@ -28,14 +28,6 @@
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
 
-# upstream fixes
-Patch1000: kdepim-3.5.6-kde#140207.patch
-Patch1001: kdepim-3.5.6-kmail-kde#140660.patch
-Patch1002: kdepim-3.5.6-kmail-templates.patch
-Patch1003: kdepim-3.5.6-security.patch
-Patch1004: kdepim-3.5.6-kmail-imap.patch
-Patch1005: timezone-update.diff.bz2
-
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -101,16 +93,6 @@
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
-%ifnarch s390 s390x
-%patch1000 -p1 -b .kde#140207
-%endif
-
-%patch1001 -p1 -b .kde#140660
-%patch1002 -p1 -b .kmail-templates
-%patch1003 -p0 -b .security
-%patch1004 -p0 -b .imap
-%patch1005 -p0 -b .timezone
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -236,6 +218,9 @@
 %exclude %{_libdir}/libremotekonnector.so
 
 %changelog
+* Wed Jun 06 2007 Than Ngo <than at redhat.com> -  6:3.5.7-0.1.fc7
+- 3.5.7
+
 * Thu May 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.6-7
 - +BR: gpgme-devel gnokii-devel libmal-devel
 - +Requires: pinentry-gui