[digikam] fix build for newer lensfun-0.2.6+
Rex Dieter
rdieter at fedoraproject.org
Thu Jun 28 15:42:09 UTC 2012
commit 2dcf29f7c7fa902518c6a03255bb6e2fc72c1cb6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Jun 28 10:45:21 2012 -0500
fix build for newer lensfun-0.2.6+
digikam-2.6.0-cmake_lensfun.patch | 11 +++++++++++
digikam.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/digikam-2.6.0-cmake_lensfun.patch b/digikam-2.6.0-cmake_lensfun.patch
new file mode 100644
index 0000000..61c2f27
--- /dev/null
+++ b/digikam-2.6.0-cmake_lensfun.patch
@@ -0,0 +1,11 @@
+diff -up digikam-2.6.0/core/cmake/modules/FindLensFun.cmake.lensfun digikam-2.6.0/core/cmake/modules/FindLensFun.cmake
+--- digikam-2.6.0/core/cmake/modules/FindLensFun.cmake.lensfun 2012-06-04 15:38:56.000000000 -0500
++++ digikam-2.6.0/core/cmake/modules/FindLensFun.cmake 2012-06-28 10:31:32.250644214 -0500
+@@ -34,6 +34,7 @@ else (LENSFUN_LIBRARIES AND LENSFUN_INCL
+ ${_lensfunIncDir}
+ /opt/local/include
+ /sw/include
++ PATH_SUFFIXES lensfun
+ )
+
+ find_library(LENSFUN_LIBRARY
diff --git a/digikam.spec b/digikam.spec
index 67bfaf0..78970f7 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -2,7 +2,7 @@
Name: digikam
Version: 2.6.0
-Release: 2%{?pre}%{?dist}
+Release: 3%{?pre}%{?dist}
Summary: A digital camera accessing & photo management application
License: GPLv2+
@@ -21,6 +21,8 @@ Source1: digikam-import.desktop
Patch0: digikam-2.5.0-clapack-atlas.patch
## upstreamable patches
+# fix detection of newer lensfun-0.2.6+
+Patch50: digikam-2.6.0-cmake_lensfun.patch
## upstream patches
@@ -217,6 +219,7 @@ BuildArch: noarch
%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
%patch0 -p1 -b .clapack-atlas
+%patch50 -p1 -b .cmake_lensfun
%build
@@ -506,6 +509,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Thu Jun 28 2012 Rex Dieter <rdieter at fedoraproject.org> 2.6.0-3
+- fix build for newer lensfun-0.2.6+
+
* Tue Jun 26 2012 Alexey Kurov <nucleo at fedoraproject.org> - 2.6.0-2
- rebuild for libpgf-6.12.24
More information about the scm-commits
mailing list