rpms/kdepim/F-9 kdepim-3.5.10-metakit_sparc64.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 kdepim.spec, 1.170, 1.171 sources, 1.47, 1.48 kdepim-3.5.9-kde#127696.patch, 1.1, NONE kdepim-3.5.9-metakit_64bit.patch, 1.1, NONE kdepim-3.5.9-metakit_sparc64.patch, 1.1, NONE kdepim-3.5.x-kmail-imap-crash.patch, 1.1, NONE kdepim-kde#151150.patch, 1.1, NONE

[Than Ngo]

Author: than

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

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-3.5.10-metakit_sparc64.patch 
Removed Files:
	kdepim-3.5.9-kde#127696.patch kdepim-3.5.9-metakit_64bit.patch 
	kdepim-3.5.9-metakit_sparc64.patch 
	kdepim-3.5.x-kmail-imap-crash.patch kdepim-kde#151150.patch 
Log Message:
3.5.10


kdepim-3.5.10-metakit_sparc64.patch:

--- NEW FILE kdepim-3.5.10-metakit_sparc64.patch ---
diff -up kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h.metakit_sparc64 kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h
--- kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h.metakit_sparc64	2008-08-19 20:15:38.000000000 +0200
+++ kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h	2008-09-01 14:24:34.000000000 +0200
@@ -101,6 +101,7 @@
     // and here's the other end of the scale...
 #if !defined (_WIN32) && !defined (q4_LONG64)
 #if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
+    (defined(__linux__) && defined(__sparc__) && defined(__arch64__) ) || \
     defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || defined (__mips64) || \
     (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
 #define q4_LONG64 1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-9/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	15 Feb 2008 03:04:32 -0000	1.42
+++ .cvsignore	1 Sep 2008 12:37:17 -0000	1.43
@@ -2,3 +2,4 @@
 cr32-app-kandy.png
 cr48-app-kandy.png
 kdepim-3.5.9.tar.bz2
+kdepim-3.5.10.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdepim.spec	6 Jun 2008 19:08:26 -0000	1.170
+++ kdepim.spec	1 Sep 2008 12:37:17 -0000	1.171
@@ -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}.1
-%else
-Release: 9%{?dist}.1
+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
@@ -51,20 +35,12 @@
 # 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.9-metakit_sparc64.patch
+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}
 
@@ -159,19 +135,11 @@
 
 
 %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
 
@@ -181,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
@@ -317,6 +280,9 @@
 
 
 %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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-9/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	15 Feb 2008 03:04:32 -0000	1.47
+++ sources	1 Sep 2008 12:37:17 -0000	1.48
@@ -1,4 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-ba27b06599556c572a26f03608471ee2  kdepim-3.5.9.tar.bz2
+fc93e458a8eec8131ede56cff30c28b2  kdepim-3.5.10.tar.bz2


--- kdepim-3.5.9-kde#127696.patch DELETED ---


--- kdepim-3.5.9-metakit_64bit.patch DELETED ---


--- kdepim-3.5.9-metakit_sparc64.patch DELETED ---


--- kdepim-3.5.x-kmail-imap-crash.patch DELETED ---


--- kdepim-kde#151150.patch DELETED ---