[digikam] Upstream fix LIB_INSTALL_DIR

nucleo nucleo at fedoraproject.org
Fri Sep 9 20:13:21 UTC 2011


commit dbf3152bc98bdccacadd1311d371021ab53cd474
Author: nucleo <nucleo at fedoraproject.org>
Date:   Fri Sep 9 23:13:08 2011 +0300

    Upstream fix LIB_INSTALL_DIR

 difikam-2.1.0-libkvkontakte-libdir.patch |   22 ++++++++++++++++++++++
 digikam.spec                             |    5 +++++
 2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/difikam-2.1.0-libkvkontakte-libdir.patch b/difikam-2.1.0-libkvkontakte-libdir.patch
new file mode 100644
index 0000000..6bea601
--- /dev/null
+++ b/difikam-2.1.0-libkvkontakte-libdir.patch
@@ -0,0 +1,22 @@
+commit bf9ffc8d808676f0ed371fbe190e10e2f85888e0
+Author: Alexander Potashev <aspotashev at gmail.com>
+Date:   Fri Sep 9 22:48:38 2011 +0400
+
+    Do not explicitly set LIB_INSTALL_DIR
+    
+    BUG:281439
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 944d2f8..c1ed4d5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,9 +11,6 @@ set(LIBKVKONTAKTE_VERSION ${LIBKVKONTAKTE_VERSION_MAJOR}.${LIBKVKONTAKTE_VERSION
+ # TODO: calculate the version id properly (here is currently a hack that won't work for 1.10.0):
+ set(LIBKVKONTAKTE_VERSION_ID "0x0${LIBKVKONTAKTE_VERSION_MAJOR}0${LIBKVKONTAKTE_VERSION_MINOR}0${LIBKVKONTAKTE_VERSION_PATCH}")
+ 
+-# set up install directories. INCLUDE_INSTALL_DIR and LIB_INSTALL_DIR must not be absolute paths
+-set(LIB_INSTALL_DIR_SUFFIX "" CACHE STRING "The directories where to install libraries to")
+-set(LIB_INSTALL_DIR lib${LIB_INSTALL_DIR_SUFFIX} )
+ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
+ 
+ # Use a versioned install directory for the headers so multiple versions can be installed in parallel
diff --git a/digikam.spec b/digikam.spec
index dfcc3d6..bcc0a9a 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -16,6 +16,8 @@ Source1: digikam-import.desktop
 ## upstreamable patches
 
 ## upstream patches
+#https://projects.kde.org/projects/kdereview/libkvkontakte/repository/revisions/bf9ffc8d808676f0ed371fbe190e10e2f85888e0
+Patch100: difikam-2.1.0-libkvkontakte-libdir.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: doxygen
@@ -192,6 +194,9 @@ Requires: kipi-plugins = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+pushd extra/libkvkontakte
+%patch100 -p1 -b .libkvkontakte-libdir
+popd
 
 %build
 


More information about the scm-commits mailing list