rpms/kdepim/F-10 .cvsignore, 1.63, 1.64 kdepim.spec, 1.212, 1.213 sources, 1.72, 1.73 kdepim-4.2.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14471/F-10

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.2.patch 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	2 Jun 2009 10:14:26 -0000	1.63
+++ .cvsignore	5 Aug 2009 13:06:17 -0000	1.64
@@ -1 +1,5 @@
-kdepim-4.2.4.tar.bz2
+kdepim-4.2.90.tar.bz2
+kdepim-4.2.95.tar.bz2
+kdepim-4.2.96.tar.bz2
+kdepim-4.2.98.tar.bz2
+kdepim-4.3.0.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- kdepim.spec	26 Jun 2009 10:55:34 -0000	1.212
+++ kdepim.spec	5 Aug 2009 13:06:17 -0000	1.213
@@ -5,18 +5,14 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.2.4
-Release: 2%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
-URL:	   http://www.kde.org/
+URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
-# 4.2 upstream patches
-# Patch100, GPGME 1.2.0 will break crypto in kdepim,
-# https://bugs.kde.org/show_bug.cgi?id=197458
-Patch100: kdepim-4.2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +20,11 @@ Provides: kdepim4 = %{version}-%{release
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
+# Upgrade path
+%if 0%{?fedora} < 12
+Requires: kdepim-runtime >= %{version}
+%endif
+
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -32,6 +33,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel
 BuildRequires: libassuan-devel
 BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -80,7 +82,7 @@ Install %{name}-devel if you want to wri
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-#Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
@@ -91,8 +93,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 
-# 4.2 upstream patches
-%patch100 -p0 -b .kde197458
+# omit conflict with oxygen-icons, working on a better long-term fix with
+# oxygen folk to get all the icons/temporary stuff out of kdepim
+rm -fv icons/temporary/ox16-status-meeting-organizer.png
+
 
 %build
 mkdir -p %{_target_platform}
@@ -108,9 +112,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# conflict with oxygen-icon-theme
-rm -rvf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png
-
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
 pushd %{buildroot}%{_docdir}/HTML/en
@@ -163,7 +164,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_datadir}/akonadi/agents/*.desktop
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/config.kcfg/*
@@ -172,7 +172,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/*
-%{_mandir}/man1/kabcclient.1*
 
 %files libs
 %defattr(-,root,root,-)
@@ -189,14 +188,33 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.4-2
-- fix the incompatible change in GPGME 1.2.0, it will break crypto in kdepim (upstream patch)
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3 
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-2
+- Requires: kdepim-runtime (< F-12)
+
+* Mon Jun 29 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.2.90-1
+- KDE 4.3 Beta 2
 
-* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-2
+- fix meeting-organizer icon conflict with oxygen-icons
+- -libs: (re)add dep on kdelibs4
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
 - drop extraneous BR's, including libmal-devel (not currently used)
@@ -214,7 +232,7 @@ rm -rf %{buildroot}
 - upstream korganizer-view patch
 
 * Wed Mar 04 2009 Than Ngo <than at redhat.com> - 4.2.1-2
-- upstream patch, speed up folder syncing 
+- upstream patch, speed up folder syncing
 
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	2 Jun 2009 10:14:26 -0000	1.72
+++ sources	5 Aug 2009 13:06:17 -0000	1.73
@@ -1 +1 @@
-e3b14bea173511628767475f0dbfb6ac  kdepim-4.2.4.tar.bz2
+ddc887f19ef9cd454f4f3226c955aaaf  kdepim-4.3.0.tar.bz2


--- kdepim-4.2.patch DELETED ---