diff options
| author | Christoph Junghans <junghans@votca.org> | 2017-02-22 08:03:17 -0700 |
|---|---|---|
| committer | Christoph Junghans <junghans@votca.org> | 2017-02-22 08:03:17 -0700 |
| commit | 09aaa984a7051d42dd533033d34c057e18fabf7f (patch) | |
| tree | 5429071ab039c61b506088d9e81f710a237f23eb | |
| parent | 8a81f0a551bd0f65a54f6580b66748ef8e457823 (diff) | |
| download | fedora-review-09aaa984a7051d42dd533033d34c057e18fabf7f.tar.gz fedora-review-09aaa984a7051d42dd533033d34c057e18fabf7f.tar.xz fedora-review-09aaa984a7051d42dd533033d34c057e18fabf7f.zip | |
espresso: changed patch source
| -rw-r--r-- | espresso/1042.patch (renamed from espresso/python_instdir.patch) | 17 | ||||
| -rw-r--r-- | espresso/espresso.spec | 9 |
2 files changed, 21 insertions, 5 deletions
diff --git a/espresso/python_instdir.patch b/espresso/1042.patch index a0d94d4..ea0c067 100644 --- a/espresso/python_instdir.patch +++ b/espresso/1042.patch @@ -1,6 +1,17 @@ ---- CMakeLists.txt.orig 2017-02-21 13:53:45.796675455 -0700 -+++ CMakeLists.txt 2017-02-21 14:18:21.398030293 -0700 -@@ -128,9 +128,11 @@ +From cf4a369485736b7a901fa02bbc911f8d5dddab6a Mon Sep 17 00:00:00 2001 +From: Christoph Junghans <junghans@votca.org> +Date: Tue, 21 Feb 2017 17:56:55 -0700 +Subject: [PATCH] cmake: allow user to override PYTHON_INSTDIR + +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6ba209..88de171 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,9 +115,11 @@ if (WITH_PYTHON) -c "import distutils.sysconfig as cg; print(cg.get_python_inc())" OUTPUT_VARIABLE PYTHON_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE) find_package(NumPy REQUIRED) diff --git a/espresso/espresso.spec b/espresso/espresso.spec index 5ceca4b..e50b1f8 100644 --- a/espresso/espresso.spec +++ b/espresso/espresso.spec @@ -30,7 +30,9 @@ Source0: https://github.com/%{name}md/%{name}/archive/%{commit}/%{name}-%{commit %else Source0: http://download.savannah.gnu.org/releases/espressomd/espresso-%{version}.tar.gz %endif -Patch0: python_instdir.patch +# PATCH-FIX-UPSTREAM - 1042.patch - allow user to override PYTHON_INSTDIR +Patch0: https://patch-diff.githubusercontent.com/raw/espressomd/espresso/pull/1042.patch + BuildRequires: cmake BuildRequires: Cython @@ -121,8 +123,9 @@ This package contains %{name} compiled against MPICH2. %else %setup -q %endif -%patch0 -p0 +%patch0 -p1 find . -name "*.[ch]pp" -exec chmod -x {} \; +chmod -x AUTHORS COPYING README NEWS ChangeLog mkdir openmpi_build mpich_build %build @@ -176,6 +179,7 @@ pushd mpich_build popd %{_mpich_unload} find %{buildroot}%{_prefix} -name "*.so" -exec chmod +x {} \; +find %{buildroot}%{_prefix} -name "gen_pxiconfig" -exec chmod +x {} \; %check # test openmpi? @@ -215,6 +219,7 @@ popd * Thu Feb 16 2017 Christoph Junghans <junghans@votca.org> - 4.0-0.1.20170220git7a9ac74 - Bump to version 4.0 git version - Drop cypthon patch, incl. upstream +- Add 1042.patch from upstream * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild |