diff --git a/0148-fix-digikamhelperdir.patch b/0148-fix-digikamhelperdir.patch new file mode 100644 index 0000000..e210d16 --- /dev/null +++ b/0148-fix-digikamhelperdir.patch @@ -0,0 +1,28 @@ +From d29c1733e5fc735e41bb0d41a18c3a46783ccb7b Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Wed, 24 Aug 2016 12:45:38 -0500 +Subject: [PATCH 148/148] fix digikamhelperdir + +Cannot assume DATA_INSTALL_DIR is a fully-qualified path + +BUG: 367675 +--- + data/hotplug/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/hotplug/CMakeLists.txt b/data/hotplug/CMakeLists.txt +index d6bb711..ca6dc1b 100644 +--- a/data/hotplug/CMakeLists.txt ++++ b/data/hotplug/CMakeLists.txt +@@ -4,7 +4,7 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-set(digikamhelperdir ${DATA_INSTALL_DIR}/digikam/utils) ++set(digikamhelperdir ${KDE_INSTALL_FULL_DATADIR}/digikam/utils) + + #configure_file(digikam-download.desktop.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/digikam-download.desktop @ONLY) + #configure_file(digikam-gphoto2-camera.desktop.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/digikam-gphoto2-camera.desktop @ONLY) +-- +2.7.4 + diff --git a/digikam.spec b/digikam.spec index 850da74..b909d38 100644 --- a/digikam.spec +++ b/digikam.spec @@ -2,7 +2,7 @@ Name: digikam Summary: A digital camera accessing & photo management application Version: 5.1.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.digikam.org/ @@ -17,6 +17,7 @@ Source10: digikam-import.desktop Patch100: digikam-5.1.0-libraw_endian.patch ## upstream patches +Patch148: 0148-fix-digikamhelperdir.patch BuildRequires: boost-devel BuildRequires: eigen3-devel @@ -172,6 +173,9 @@ BuildArch: noarch %setup -q -n %{name}-%{version}%{?beta:-%{beta}} %patch100 -p1 -b .libraw_endian +pushd core +%patch148 -p1 -b .0148 +popd # try to fix doc-translated mess, see also #https://bugs.kde.org/show_bug.cgi?id=365135#c18 @@ -325,6 +329,9 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||: %changelog +* Wed Aug 24 2016 Rex Dieter - 5.1.0-4 +- fix digikamhelperdir (kde#367675) + * Fri Aug 12 2016 Rex Dieter - 5.1.0-3 - Recommends: qt5-qtimageformats