commit 5baea90261e0e061b70a625d2d3480fa1b10b1a2
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Dec 21 08:42:11 2012 -0600
4.9.95-2
- nepomuk-core related upstream patches
- -devel: Requires: nepomuk-core-devel
^^ I don't personally like the added dep here, hopefully upstream
will come up with something better soon.
0001-NepomukCore-is-not-optional.patch | 25 ++++++++++++++++++++++++
0002-Find-NepomukCore-if-not-found-yet.patch | 27 ++++++++++++++++++++++++++
kdepimlibs.spec | 12 ++++++++++-
3 files changed, 63 insertions(+), 1 deletions(-)
---
diff --git a/0001-NepomukCore-is-not-optional.patch b/0001-NepomukCore-is-not-optional.patch
new file mode 100644
index 0000000..856a156
--- /dev/null
+++ b/0001-NepomukCore-is-not-optional.patch
@@ -0,0 +1,25 @@
+From c8e1a1b9199fa2398a1d4d44c8dbee0cfb6fd8e3 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <cgiboudeaux at gmx.com>
+Date: Wed, 19 Dec 2012 15:20:49 +0100
+Subject: [PATCH 36/39] NepomukCore is not optional
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6393f90..8a7cdfd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,7 +109,7 @@ if (NOT KDEPIM_ONLY_KLEO)
+ endif()
+
+ find_package(NepomukCore)
+- set_package_properties(Nepomuk PROPERTIES DESCRIPTION "NepomukCore" URL "http://www.kde.org" TYPE OPTIONAL PURPOSE "Nepomuk extends the search and tagging functionalities in KMail and Akonadi")
++ set_package_properties(Nepomuk PROPERTIES DESCRIPTION "NepomukCore" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Nepomuk extends the search and tagging functionalities in KMail and Akonadi")
+
+ set(LIBICAL_MIN_VERSION "0.42")
+ find_package(Libical)
+--
+1.8.0.2
+
diff --git a/0002-Find-NepomukCore-if-not-found-yet.patch b/0002-Find-NepomukCore-if-not-found-yet.patch
new file mode 100644
index 0000000..8fbe8c7
--- /dev/null
+++ b/0002-Find-NepomukCore-if-not-found-yet.patch
@@ -0,0 +1,27 @@
+From de3a6c213202e028a97ab5081e94468bc65c9868 Mon Sep 17 00:00:00 2001
+From: "Yury G. Kudryashov" <urkud.urkud at gmail.com>
+Date: Thu, 20 Dec 2012 13:51:34 +0359
+Subject: [PATCH 37/39] Find NepomukCore if not found yet.
+
+This fixes build of kdeplasma-addons. It looks for kdepimlibs but not for nepomuk-core.
+---
+ KdepimLibsConfig.cmake.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/KdepimLibsConfig.cmake.in b/KdepimLibsConfig.cmake.in
+index e4c3ee1..65ab8b7 100644
+--- a/KdepimLibsConfig.cmake.in
++++ b/KdepimLibsConfig.cmake.in
+@@ -53,6 +53,9 @@ set(KALARM_USE_KRESOURCES @KALARM_USE_KRESOURCES@)
+
+ # Make sure to load the exported targets only once
+ # For the rest of this script it doesn't matter that much
++if(NOT TARGET nepomukcore)
++ find_package(NepomukCore NO_MODULE)
++endif()
+ if(NOT TARGET KDEPIMLibs__kabc)
+ get_filename_component(_currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ include("${_currentDir}/KDEPimLibsLibraryTargetsWithPrefix.cmake")
+--
+1.8.0.2
+
diff --git a/kdepimlibs.spec b/kdepimlibs.spec
index c847710..93a7e01 100644
--- a/kdepimlibs.spec
+++ b/kdepimlibs.spec
@@ -7,7 +7,7 @@
Name: kdepimlibs
Summary: KDE PIM Libraries
Version: 4.9.95
-Release: 1%{?dist}
+Release: 2%{?dist}
# http://techbase.kde.org/Policies/Licensing_Policy
License: LGPLv2+
@@ -21,6 +21,8 @@ URL: http://www.kde.org/
Source0: http://download.kde.org/%{stable}/%{version}/src/kdepimlibs-%{version}.tar.xz
## upstream patches
+Patch101: 0001-NepomukCore-is-not-optional.patch
+Patch102: 0002-Find-NepomukCore-if-not-found-yet.patch
Requires: %{name}-kxmlrpcclient%{?_isa} = %{version}-%{release}
%if ! 0%{?akonadi_subpkg}
@@ -68,6 +70,7 @@ Obsoletes: kdepimlibs4-devel < %{version}-%{release}
Provides: kdepimlibs4-devel = %{version}-%{release}
Requires: boost-devel
Requires: kdelibs4-devel
+Requires: nepomuk-core-devel
%description devel
Header files for developing applications using %{name}.
@@ -102,6 +105,9 @@ quite easy to use.
%prep
%setup -q
+%patch101 -p1 -b .0001
+%patch102 -p1 -b .0002
+
%build
mkdir -p %{_target_platform}
@@ -285,6 +291,10 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null
%changelog
+* Fri Dec 21 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.95-2
+- nepomuk-core related upstream patches
+- -devel: Requires: nepomuk-core-devel
+
* Wed Dec 19 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.95-1
- 4.9.95
- BR: nepomuk-core