[gdl] Fix python find_package usage
Orion Poplawski
orion at fedoraproject.org
Tue Jun 10 13:38:21 UTC 2014
commit 41008c214a5da214403306739b1d4084b6ee633f
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Jun 10 07:38:15 2014 -0600
Fix python find_package usage
gdl-find_python.patch | 13 +++++++++++++
gdl.spec | 9 ++++++++-
2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/gdl-find_python.patch b/gdl-find_python.patch
new file mode 100644
index 0000000..2941f32
--- /dev/null
+++ b/gdl-find_python.patch
@@ -0,0 +1,13 @@
+diff -up gdl-0.9.4/CMakeLists.txt.find_python gdl-0.9.4/CMakeLists.txt
+--- gdl-0.9.4/CMakeLists.txt.find_python 2014-06-09 09:53:24.687212183 -0600
++++ gdl-0.9.4/CMakeLists.txt 2014-06-09 09:58:17.226030715 -0600
+@@ -628,8 +628,8 @@ if(PYTHON OR PYTHON_MODULE)
+ else()
+ set(PythonLibs_FIND_VERSION 2)
+ endif()
++ find_package(PythonInterp)
+ find_package(PythonLibs)
+- include(FindPythonInterp)
+ endif()
+ set(USE_PYTHON ${PYTHONLIBS_FOUND})
+ if(PYTHONLIBS_FOUND)
diff --git a/gdl.spec b/gdl.spec
index 915af0b..83a9605 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -2,7 +2,7 @@
Name: gdl
Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -34,6 +34,9 @@ Patch7: gdl-eigen.patch
# Fix -Wreorder warnings
# https://sourceforge.net/p/gnudatalanguage/patches/71/
Patch8: gdl-reorder.patch
+# Fix python find_package usage
+# https://sourceforge.net/p/gnudatalanguage/patches/77/
+Patch9: gdl-find_python.patch
Patch13: gdl-0.9-antlr-cmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -124,6 +127,7 @@ popd
%patch6 -p1 -b .gsl
%patch7 -p1 -b .eigen
%patch8 -p1 -b .reorder
+%patch9 -p1 -b .find_python
%global cmake_opts \\\
-DWXWIDGETS=ON \\\
@@ -202,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 9 2014 Orion Poplawski <orion at cora.nwra.com> - 0.9.4-4
+- Fix python find_package usage
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list