commit 2bb1e041f7f207abeb5654bec306a723bb0c7992
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jun 30 15:24:35 2011 -0500
4.6.90
.gitignore | 2 +-
kdepim-runtime.spec | 25 ++++++++++++++++---------
sources | 2 +-
3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9bf76e4..72f6659 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kdepim-runtime-4.6.0.tar.bz2
+/kdepim-runtime-4.6.90.tar.bz2
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 3f17349..f3fe116 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -2,29 +2,30 @@
Name: kdepim-runtime
Summary: KDE PIM Runtime Environment
Epoch: 1
-Version: 4.6.0
+Version: 4.6.90
Release: 1%{?dist}
License: GPLv2
Group: Applications/Productivity
URL:
http://www.kde.org/
-Source0:
ftp://ftp.kde.org/pub/kde/stable/kdepim-%{version}/src/kdepim-runtime-%{v...
+Source0:
ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepim-runtime-%{versio...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# show the Akonadi KCM in System Settings (#565420)
Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
Provides: kdepim4-runtime = %{version}-%{release}
-Provides: kde-l10n-kdepim-runtime = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-BuildRequires: akonadi-devel >= 1.5.0
+BuildRequires: akonadi-devel >= 1.5.80
+%global akonadi_version_min 1.5.80
%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo
%{akonadi_version_min})
+BuildRequires: akonadi-devel >= %{akonadi_version_min}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: kdepimlibs-devel >= 4.5.95
+BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: libxslt-devel libxml2-devel
BuildRequires: shared-desktop-ontologies
BuildRequires: soprano-devel
@@ -77,8 +78,6 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --all-name --with-kde
-
%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -111,7 +110,7 @@ fi
rm -rf %{buildroot}
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_libdir}/kde4/*.so
@@ -121,7 +120,12 @@ rm -rf %{buildroot}
%{_kde4_datadir}/autostart/kaddressbookmigrator.desktop
%{_kde4_datadir}/config/*rc
%{_kde4_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_datadir}/kde4/services/akonadi/davgroupware-providers/
+%{_kde4_datadir}/kde4/services/kresources/kabc/*.desktop
+%{_kde4_datadir}/kde4/services/kresources/kcal/*.desktop
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
%{_kde4_datadir}/mime/packages/*.xml
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/akonadi/
@@ -138,6 +142,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 30 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1:4.6.90-1
+- 4.6.90
+
* Fri Jun 10 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1:4.6.0-1
- 4.6.0
diff --git a/sources b/sources
index 241655e..0b82ac0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7b5409cb22d57bd817a6d653f714bd7 kdepim-runtime-4.6.0.tar.bz2
+c2d9e470f4614277e4e0ecd46fcec5ba kdepim-runtime-4.6.90.tar.bz2