rpms/kdepimlibs/F-10 kdepimlibs.spec,1.59,1.60

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdepimlibs.spec 
Log Message:
* Wed Feb 18 2009 Than Ngo <than at redhat.com> - 4.2.0-4
- enable akonadi subpkg



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdepimlibs.spec	16 Feb 2009 17:00:55 -0000	1.59
+++ kdepimlibs.spec	20 Feb 2009 14:14:01 -0000	1.60
@@ -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}
+Release: 4%{?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
@@ -116,11 +133,20 @@
 for i in lib*.so
 do
   case "$i" in
+# conflicts with kdelibs3
     libkabc.so | libkresources.so)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
+%if 0%{?fedora} < 10
+# conflicts with kdepim3
+    libgpgme++.so | libkcal.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+%endif
   esac
 done
 popd
@@ -157,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/*
@@ -181,6 +215,13 @@
 
 
 %changelog
+* 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)
 - kde4/devel symlinks: blacklist only known conflicts