rpms/kdepimlibs/F-9 kdepimlibs.spec,1.48,1.49 sources,1.24,1.25

[Lukas Tinkl]

Author: ltinkl

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

Modified Files:
	kdepimlibs.spec sources 
Log Message:
KDE 4.2.1



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdepimlibs.spec	18 Feb 2009 16:42:29 -0000	1.48
+++ kdepimlibs.spec	27 Feb 2009 18:08:10 -0000	1.49
@@ -11,12 +11,13 @@
 %define rest 1
 #endif
 
+%define akonadi_subpkg 1
 %define akonadi_version 1.1.1
 %define debug 1 
 
 Name: kdepimlibs
-Version: 4.2.0
-Release: 2%{?dist}.1
+Version: 4.2.1
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -27,7 +28,10 @@
 Patch0: kdepimlibs-4.1.85-debug-cmake-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if ! 0%{?akonadi_subpkg}
+Provides: %{name}-akonadi%{?_isa} = %{version}-%{release}
 Requires: akonadi >= %{akonadi_version}
+%endif
 Requires: kdelibs4 >= %{version}
 
 BuildRequires: akonadi-devel >= %{akonadi_version} 
@@ -53,6 +57,9 @@
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Requires: %{name} = %{version}-%{release}
+%if 0%{?akonadi_subpkg}
+Requires: %{name}-akonadi = %{version}-%{release}
+%endif
 Obsoletes: kdepimlibs4-devel < %{version}-%{release}
 Provides:  kdepimlibs4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -63,6 +70,16 @@
 %description devel
 Header files for developing applications using %{name}.
 
+%package akonadi
+Summary: Akonadi runtime support for %{name}
+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}
+%description akonadi
+%{summary}.
+
 %package apidocs
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
@@ -166,6 +183,14 @@
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kioslave/
 
+%if 0%{?akonadi_subpkg}
+%exclude %{_kde4_libdir}/libakonadi-*.so.*
+%files akonadi
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libakonadi-*.so.*
+%endif
+%{_kde4_appsdir}/akonadi-kde/
+
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules/*
@@ -190,8 +215,18 @@
 
 
 %changelog
-* Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2.1
-- -devel: fix conflicts with kdepim(3)-devel (f9)
+* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+- 4.2.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Than Ngo <than at redhat.com> - 4.2.0-4
+- enable akonadi subpkg
+
+* Mon Feb 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- include toggle for -akonadi subpkg (not enabled)
+- Provides: -akonadi
 
 * Mon Feb 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
 - multilib conflicts (#485659)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	27 Jan 2009 17:27:54 -0000	1.24
+++ sources	27 Feb 2009 18:08:10 -0000	1.25
@@ -1 +1 @@
-8a91677e2dca7d4db26b33c78e239e5e  kdepimlibs-4.2.0.tar.bz2
+5f220939f33c38992f419d5dfc6874df  kdepimlibs-4.2.1.tar.bz2