rpms/kdepimlibs/F-10 .cvsignore, 1.32, 1.33 kdepimlibs.spec, 1.69, 1.70 sources, 1.34, 1.35 kdepimlibs_4.2.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Removed Files:
	kdepimlibs_4.2.patch 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	31 May 2009 14:03:54 -0000	1.32
+++ .cvsignore	4 Aug 2009 23:04:43 -0000	1.33
@@ -1 +1,5 @@
-kdepimlibs-4.2.4.tar.bz2
+kdepimlibs-4.2.90.tar.bz2
+kdepimlibs-4.2.95.tar.bz2
+kdepimlibs-4.2.96.tar.bz2
+kdepimlibs-4.2.98.tar.bz2
+kdepimlibs-4.3.0.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- kdepimlibs.spec	26 Jun 2009 11:01:45 -0000	1.69
+++ kdepimlibs.spec	4 Aug 2009 23:04:45 -0000	1.70
@@ -1,9 +1,6 @@
-
 %if 0%{?fedora} > 8
-%ifnarch armv5tel sparcv9 sparc64
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
-%endif
 %else
 # don't build apidocs on Fedora < 9 for now, because we don't have the required
 # files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
@@ -11,28 +8,24 @@
 %endif
 
 %define akonadi_subpkg 1
-%define akonadi_version 1.1.1
+%define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.2.4
+Version: 4.3.0
 Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
-License: LGPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 Group: System Environment/Libraries
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-# 4.2 upstream patches
-# Patch100, GPGME 1.2.0 will break crypto in kdepim,
-# https://bugs.kde.org/show_bug.cgi?id=197458
-Patch100: kdepimlibs_4.2.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
 Provides: %{name}-akonadi%{?_isa} = %{version}-%{release}
-Requires: akonadi >= %{akonadi_version}
+Requires: akonadi%{?_isa} >= %{akonadi_version}
 %endif
 Requires: kdelibs4 >= %{version}
 
@@ -51,6 +44,9 @@ BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+# stuff moved kdepim -> kdepimlibs, help upgrade path
+Conflicts: kdepim < 6:4.2.90
+
 %description
 Personal Information Management (PIM) libraries for the
 K Desktop Environment 4.
@@ -78,7 +74,7 @@ Group: System Environment/Libraries
 # when pkg split occurrs, not sure if this is really needed, but... -- Rex
 #Obsoletes: kdepimlibs < 4.2.0-3
 Requires: %{name} = %{version}-%{release}
-Requires: akonadi >= %{akonadi_version}
+Requires: akonadi%{?_isa} >= %{akonadi_version}
 %description akonadi
 %{summary}.
 
@@ -98,8 +94,6 @@ format for easy browsing.
 %prep
 %setup -q -n kdepimlibs-%{version}
 
-#upstream patches
-%patch100 -p0 -b .kde#197458
 
 %build
 mkdir -p %{_target_platform}
@@ -188,7 +182,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kioslave/
-
+%{_kde4_appsdir}/libkholidays/
+%{_kde4_datadir}/mime/packages/kdepimlibs-mime.xml
 %if 0%{?akonadi_subpkg}
 %exclude %{_kde4_libdir}/libakonadi-*.so.*
 %files akonadi
@@ -218,17 +213,44 @@ 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)
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- akonadi_version 1.2.0
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-3
+- Conflicts: kdepim < 4.2.90
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- License: LGPLv2+
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- akonadi_version 1.1.95
+
+* Mon Jun 29 2009 Than Ngo <than at redhat.com> - 4.2.95-2
+- respin
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 RC1
 
-* Sun May 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Tue May 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-1.1
-- no -apidocs for arm, sparc bootstrap (no graphviz)
+* Sun May 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
+- (min) akonadi_version 1.1.85
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Mon May 11 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- 4.2.85
 
 * Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
 - fix libkcal devel symlink hack


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	31 May 2009 14:03:55 -0000	1.34
+++ sources	4 Aug 2009 23:04:45 -0000	1.35
@@ -1 +1 @@
-ee1d783140be0bb67652784f6fa93f70  kdepimlibs-4.2.4.tar.bz2
+313f1a9d353f82c2ffee517115404dd5  kdepimlibs-4.3.0.tar.bz2


--- kdepimlibs_4.2.patch DELETED ---