rpms/kdepim/F-9 crystalsvg-conflicts.txt, 1.3, 1.4 kdepim-3.5.9-metakit_sparc64.patch, NONE, 1.1 kdepim.spec, 1.167, 1.168

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdepim.spec 
Added Files:
	crystalsvg-conflicts.txt kdepim-3.5.9-metakit_sparc64.patch 
Log Message:
temporarily revert back to 3.5.9-9 to fix a sparc issue

* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-9.1
- metakit patch to fix build on sparc64



Index: crystalsvg-conflicts.txt
===================================================================
RCS file: crystalsvg-conflicts.txt
diff -N crystalsvg-conflicts.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ crystalsvg-conflicts.txt	6 Jun 2008 19:02:14 -0000	1.4
@@ -0,0 +1,20 @@
+akregator_empty.png
+button_fewer.png
+button_more.png
+gpg.png
+gpgsm.png
+kalarm.png
+kmailcvt.png
+kmaillight.png
+konsolekalendar.png
+kontact_contacts.png
+kontact_date.png
+kontact_journal.png
+kontact_mail.png
+kontact_news.png
+kontact_notes.png
+kontact_summary_green.png
+kontact_summary.png
+kontact_todo.png
+kpalmdoc.png
+rss_tag.png

kdepim-3.5.9-metakit_sparc64.patch:

--- NEW FILE kdepim-3.5.9-metakit_sparc64.patch ---
diff -up kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h.metakit_sparc64 kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h
--- kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h.metakit_sparc64	2006-07-22 03:14:06.000000000 -0500
+++ kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h	2008-06-06 13:39:31.000000000 -0500
@@ -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 (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
 #define q4_LONG64 1


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdepim.spec	5 Jun 2008 19:58:20 -0000	1.167
+++ kdepim.spec	6 Jun 2008 19:02:14 -0000	1.168
@@ -35,22 +35,23 @@
 # script used to generate svn checkout Source0 above
 Source1: kdepim-enterprise-svn_checkout.sh
 
-Release: 10.%{ent_date}svn.ent%{?dist}.1
+Release: 9.%{ent_date}svn.ent%{?dist}
 %else
-Release: 10%{?dist}.1
+Release: 9%{?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
 Source12: cr16-app-kandy.png
+Source20: crystalsvg-conflicts.txt
 
 Patch1: kdepim-3.4.0-kandy-icons.patch
 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 build on sparc64 (and potentially other 64bit platforms)
-Patch7: kdepim-3.5.9-metakit_64bit.patch
+# fix sparc64 build
+Patch7: kdepim-3.5.9-metakit_sparc64.patc
 
 ## upstream patches
 # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync@774532 \
@@ -172,7 +173,7 @@
 %patch2 -p1 -b .xdg_open
 
 %patch6 -p0 -b .gnokii
-%patch7 -p1 -b .metakit_64bit
+%patch7 -p1 -b .metakit_sparc64
 
 %if 0%{?fedora} > 8
 pushd kitchensync
@@ -236,6 +237,14 @@
  -e "s at -lgpgme@@g" \
  -e "s at -lgpg-error@@g"
 
+%if 0%{?fedora} > 8
+# omit conflicts with kdeartwork-icons-crystalsvg
+# keep only: {kandy,kpilotDaemon}.png
+for icon in `cat %{SOURCE20}` ; do 
+  rm -f %{buildroot}%{_datadir}/icons/crystalsvg/*/*/${icon}
+done
+%endif
+
 
 %post
 %{!?libs:/sbin/ldconfig}
@@ -308,11 +317,8 @@
 
 
 %changelog
-* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-10.1
-- metakit_64bit patch, fix build on sparc64
-
-* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-10
-- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
+* 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)