[digikam] - fix FindCLAPACK.cmake to search %{_libdir}/atlas
Kevin Kofler
kkofler at fedoraproject.org
Fri Sep 23 05:13:55 UTC 2011
commit f0b57f5ad8ae57c47ee79bbf2cfd4f8cf3cb3e3c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Fri Sep 23 07:13:35 2011 +0200
- fix FindCLAPACK.cmake to search %{_libdir}/atlas
digikam-2.1.1-clapack-atlas.patch | 12 ++++++++++++
digikam.spec | 6 ++++++
2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/digikam-2.1.1-clapack-atlas.patch b/digikam-2.1.1-clapack-atlas.patch
new file mode 100644
index 0000000..ac59659
--- /dev/null
+++ b/digikam-2.1.1-clapack-atlas.patch
@@ -0,0 +1,12 @@
+diff -ur digikam-2.1.1/core/cmake/modules/FindCLAPACK.cmake digikam-2.1.1-clapack-atlas/core/cmake/modules/FindCLAPACK.cmake
+--- digikam-2.1.1/core/cmake/modules/FindCLAPACK.cmake 2011-09-14 08:22:02.000000000 +0200
++++ digikam-2.1.1-clapack-atlas/core/cmake/modules/FindCLAPACK.cmake 2011-09-23 07:09:37.000000000 +0200
+@@ -27,7 +27,7 @@
+ endif(CLAPACK_INCLUDE_DIR)
+ endif(CLAPACK_INCLUDE_DIR)
+
+- find_library(CLAPACK_LIBRARY clapack)
++ find_library(CLAPACK_LIBRARY clapack PATH_SUFFIXES atlas)
+ if(CLAPACK_LIBRARY)
+ message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}")
+ endif(CLAPACK_LIBRARY)
diff --git a/digikam.spec b/digikam.spec
index 60637ad..3d4b030 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: digikam-import.desktop
## upstreamable patches
+# fix FindCLAPACK.cmake to search %%{_libdir}/atlas
+# This should be upstreamable, it just adds a possible libdir suffix to search.
+Patch50: digikam-2.1.1-clapack-atlas.patch
## upstream patches
#https://projects.kde.org/projects/kdereview/libkvkontakte/repository/revisions/bf9ffc8d808676f0ed371fbe190e10e2f85888e0
@@ -196,6 +199,8 @@ Requires: kipi-plugins = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
+%patch50 -p1 -b .clapack-atlas
+
pushd extra/libkvkontakte
%patch100 -p1 -b .libkvkontakte-libdir
popd
@@ -461,6 +466,7 @@ update-desktop-database -q &> /dev/null
%changelog
* Fri Sep 23 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-2
- BuildRequires: atlas-devel (for clapack, instead of the bundled version)
+- fix FindCLAPACK.cmake to search %%{_libdir}/atlas
* Wed Sep 14 2011 Alexey Kurov <nucleo at fedoraproject.org> - 2.1.1-1
- digikam-2.1.1
More information about the scm-commits
mailing list