rpms/kdepimlibs/devel kdepimlibs.spec,1.70,1.71
Rex Dieter
rdieter at fedoraproject.org
Mon Feb 16 18:10:01 UTC 2009
- Previous message (by thread): rpms/keychain/devel keychain.csh, 1.4, 1.5 keychain.sh, 1.5, 1.6 keychain.spec, 1.11, 1.12
- Next message (by thread): rpms/perl-HTTP-Proxy/devel .cvsignore, 1.5, 1.6 perl-HTTP-Proxy.spec, 1.7, 1.8 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10562
Modified Files:
kdepimlibs.spec
Log Message:
* Mon Feb 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- include toggle for -akonadi subpkg (not enabled)
- Provides: -akonadi
Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdepimlibs.spec 16 Feb 2009 16:21:39 -0000 1.70
+++ kdepimlibs.spec 16 Feb 2009 18:09:30 -0000 1.71
@@ -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: 3%{?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
@@ -157,6 +174,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 +206,10 @@
%changelog
+* 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
- Previous message (by thread): rpms/keychain/devel keychain.csh, 1.4, 1.5 keychain.sh, 1.5, 1.6 keychain.spec, 1.11, 1.12
- Next message (by thread): rpms/perl-HTTP-Proxy/devel .cvsignore, 1.5, 1.6 perl-HTTP-Proxy.spec, 1.7, 1.8 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list