[kdepim-runtime] +akonadi-google bits
Rex Dieter
rdieter at fedoraproject.org
Sun Jun 10 13:29:27 UTC 2012
commit bb63c4a29b91e158d4d7a6660a9b5d71be792f81
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun Jun 10 08:32:06 2012 -0500
+akonadi-google bits
kdepim-runtime.spec | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 2a6c2ba..6398922 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -1,4 +1,4 @@
-%global akonadi_version_min 1.6.0
+%global akonadi_version_min 1.7.0
%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
Name: kdepim-runtime
@@ -8,7 +8,6 @@ Version: 4.8.90
Release: 1%{?dist}
License: GPLv2
-Group: Applications/Productivity
URL: http://www.kde.org/
%global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50
@@ -33,6 +32,15 @@ Obsoletes: kdepim-runtime-devel < 1:4.7.90-3
Provides: kdepim4-runtime = %{version}-%{release}
+Obsoletes: akonadi-google < 0.4
+Provides: akonadi-google = %{version}-%{release}
+Obsoletes: akonadi-google-calendar < 0.4
+Provides: akonadi-google-calendar = %{version}-%{release}
+Obsoletes: akonadi-google-contacts < 0.4
+Provides: akonadi-google-contacts = %{version}-%{release}
+Obsoletes: akonadi-google-tasks < 0.4
+Provides: akonadi-google-tasks = %{version}-%{release}
+
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
@@ -40,20 +48,19 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: pkgconfig(akonadi) >= %{akonadi_version_min}
+BuildRequires: pkgconfig(libkgapi)
BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(shared-desktop-ontologies)
BuildRequires: pkgconfig(soprano)
BuildRequires: pkgconfig(zlib)
+## FIXME/TODO
+# * KolabLibraries (0.2 or higher) <http://git.kolab.org/>
%description
%{summary}
%package libs
Summary: %{name} runtime libraries
-Group: System Environment/Libraries
-## these may be overkill -- Rex
-#Provides: kdepim4-runtime-libs = %{version}-%{release}
-#Provides: kdepim4-runtime-libs%{?_isa} = %{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: akonadi%{?_isa} >= %{akonadi_version}
%{?_kde4_version:Requires: kdepimlibs-akonadi%{?_isa} >= %{_kde4_version}}
@@ -114,7 +121,6 @@ if [ $1 -eq 0 ] ; then
fi
%files
-%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_libdir}/kde4/*.so
%{_kde4_libdir}/kde4/imports/*
@@ -141,7 +147,6 @@ fi
%postun libs -p /sbin/ldconfig
%files libs
-%defattr(-,root,root,-)
%{_kde4_libdir}/libakonadi-filestore.so.4*
%{_kde4_libdir}/libakonadi-xml.so.4*
%{_kde4_libdir}/libkdepim-runtime-dms-copy.so
More information about the scm-commits
mailing list