[kdepim-runtime/f14/master] - Akonadi Configuration shows in systemsettings->lost and found (#628379) - Requires: kdebase-runtim
Rex Dieter
rdieter at fedoraproject.org
Wed Sep 8 13:56:24 UTC 2010
commit b4b561239798416c0b3fa6431cea291bc62a1f1a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Sep 8 09:02:00 2010 -0500
- Akonadi Configuration shows in systemsettings->lost and found (#628379)
- Requires: kdebase-runtime
kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch | 15 +++++++++++++++
kdepim-runtime.spec | 11 +++++++++++
2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch b/kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch
new file mode 100644
index 0000000..1ed4e4b
--- /dev/null
+++ b/kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch
@@ -0,0 +1,15 @@
+diff -ur kdepim-runtime-4.4.0/kcm/kcm_akonadi.desktop kdepim-runtime-4.4.0-show-akonadi-kcm/kcm/kcm_akonadi.desktop
+--- kdepim-runtime-4.4.0/kcm/kcm_akonadi.desktop 2010-02-04 10:33:11.000000000 +0100
++++ kdepim-runtime-4.4.0-show-akonadi-kcm/kcm/kcm_akonadi.desktop 2010-02-15 17:23:05.000000000 +0100
+@@ -8,9 +8,10 @@
+ X-KDE-Library=kcm_akonadi
+ X-KDE-FactoryName=kcm_akonadi
+ X-KDE-HasReadOnlyMode=false
+-X-KDE-ParentApp=
++X-KDE-ParentApp=kcontrol
+ X-KDE-ParentComponents=
+ X-KDE-CfgDlgHierarchy=
++X-KDE-System-Settings-Parent-Category=workspace-appearance-and-behavior
+
+ Name=Akonadi Configuration
+ Name[ar]=ضبط اكوندا
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 1bf3824..4cf2f44 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -12,10 +12,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# show the Akonadi KCM in System Settings (#565420)
Patch0: kdepim-runtime-4.4.0-show-akonadi-kcm.patch
+# version of patch0 for kde45
+Patch1: kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch
# upstream patches
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
BuildRequires: akonadi-devel
BuildRequires: desktop-file-utils
@@ -54,7 +57,11 @@ Install %{name}-devel if you want to write or compile %{name} plugins.
%prep
%setup -q -n kdepim-runtime-%{version}
+%if "%{?_kde4_version}" >= "4.5.0"
+%patch1 -p1 -b .show-akonadi-kcm-kde45
+%else
%patch0 -p1 -b .show-akonadi-kcm
+%endif
%build
@@ -136,6 +143,10 @@ rm -rf %{buildroot}
%changelog
+* Wed Sep 08 2010 Rex Dieter <rdieter at fedoraproject.org> 4.4.5-2
+- Akonadi Configuration shows in systemsettings->lost and found (#628379)
+- Requires: kdebase-runtime
+
* Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.5-1
- 4.4.5
More information about the scm-commits
mailing list