rpms/kdepim/F-8 kdepim.spec,1.148,1.149

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdepim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28295

Modified Files:
	kdepim.spec 
Log Message:
3.5.10



Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-8/kdepim.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kdepim.spec	11 Apr 2008 15:04:33 -0000	1.148
+++ kdepim.spec	1 Sep 2008 14:32:36 -0000	1.149
@@ -1,9 +1,4 @@
 
-## enterprise branch
-#define etch_ver 3.5.6 
-#define ent_date 20080109 
-#define ent_rev 744693
-
 #define debug 1 
 ## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
 #define final 1 
@@ -21,25 +16,14 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 3.5.9
+Version: 3.5.10
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if 0%{?ent_date} > 0
-# hmm, v3.5.6 eh?  FIXME? -- Rex
-#Source0: http://apt.intevation.de/dists/etch/unstable/source/kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz
-Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-# script used to generate svn checkout Source0 above
-Source1: kdepim-enterprise-svn_checkout.sh
-
-Release: 9.%{ent_date}svn.ent%{?dist}
-%else
-Release: 9%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%endif
 
 Source10: cr48-app-kandy.png
 Source11: cr32-app-kandy.png
@@ -50,19 +34,13 @@
 Patch2: kdepim-xdg_open.patch
 # patch by Dirk Müller from openSUSE to fix gnokii detection
 Patch6: kdepim-3.5.9-gnokii-no-libintl.patch
+# fix sparc64 build
+Patch7: kdepim-3.5.10-metakit_sparc64.patch
 
 ## upstream patches
 # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync@774532 \
 # svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API@774532 >kdepim-3.5.9-opensync03.patch
 Patch3: kdepim-3.5.9-opensync03.patch
-# http://websvn.kde.org/?view=rev&revision=775015
-# http://bugs.kde.org/127696
-# Upstream fix for "Unable to complete LIST operation" errors with some servers,
-Patch4: kdepim-3.5.9-kde#127696.patch
-# http://bugs.kde.org/151150
-# http://websvn.kde.org/?view=rev&revision=779994
-Patch5: kdepim-kde#151150.patch
-Patch100: kdepim-3.5.x-kmail-imap-crash.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -157,20 +135,13 @@
 
 
 %prep
-## Ugh 3 options, switch this by hand
-# stock upstream 
 %setup -q
-# etch upstream sources
-#setup -q %{?etch_ver: -n kdepim-%{etch_ver}.enterprise.0.%{ent_date}.%{ent_rev}}
-# svn snapshot
-#setup -q -n kdepim
 
 install -m644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} kandy/src/
 %patch1 -p1 -b .kandy-icons
-
 %patch2 -p1 -b .xdg_open
-
 %patch6 -p0 -b .gnokii
+%patch7 -p1 -b .metakit_sparc64
 
 %if 0%{?fedora} > 8
 pushd kitchensync
@@ -178,11 +149,6 @@
 popd
 %endif
 
-%patch4 -p0 -b .kde127696
-%patch5 -p1 -b .kde151150
-
-%patch100 -p0 -b .kmail-imap-crash
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -314,6 +280,12 @@
 
 
 %changelog
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 3.5.10-1
+- 3.5.10
+
+* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-9.1
+- metakit patch to fix build on sparc64
+
 * Fri Apr 11 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-9
 - omit multilib upgrade hacks (see also #441222)