[shogun/el5] copy all stuff into %%{py3dir} for the Python3-build
Björn Esser
besser82 at fedoraproject.org
Mon Feb 24 11:27:56 UTC 2014
commit 2b9ce1d66177d197affb78ab84976eb5e1715cf5
Author: Björn Esser <bjoern.esser at gmail.com>
Date: Mon Feb 24 12:28:16 2014 +0100
copy all stuff into %%{py3dir} for the Python3-build
shogun.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/shogun.spec b/shogun.spec
index c6dc404..f496c9d 100644
--- a/shogun.spec
+++ b/shogun.spec
@@ -583,8 +583,8 @@ install -pm0755 %{SOURCE99} ./scripts/
./scripts/light-scrubber.sh
# Remove cluttering stuff and create some needed dirs.
-rm -rf build data doc/tutorial py3_build third_party
-mkdir -p build py3_build third_party/GoogleMock
+rm -rf %{py3dir} build data doc/tutorial third_party
+mkdir -p build third_party/GoogleMock
# Unbundle Tapkee. This is pretty the same as we have in our repos.
rm -rf doc/md/LICENSE_tapkee.md
@@ -663,6 +663,9 @@ do
ln -fs %{_datadir}/%{name}/data/toy examples/${_dir}/data
done
+# Copy all stuff into %%{py3dir} for the Python3-build.
+cp -a . %{py3dir}
+
###############################################################################
%build
@@ -724,7 +727,7 @@ export PYTHONPATH="${PYTHONPATH}:`pwd`/test_install/%{python3_sitearch}"
export PYTHONPATH="${PYTHONPATH}:$(pwd)/examples/undocumented/python_modular"
export PYTHONPATH="${PYTHONPATH}:%{python3_sitearch}:%{python3_sitelib}"
-pushd py3_build
+pushd %{py3dir}
%cmake \
-DCMAKE_BUILD_TYPE=Distribution \
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
@@ -768,7 +771,7 @@ popd
export CUSTOM_INSTALL_DIR="`pwd`/test_install/"
# Install the Python3-version first.
%if 0%{?with_python3}
-pushd py3_build
+pushd %{py3dir}
make install DESTDIR=${CUSTOM_INSTALL_DIR}
popd
%endif #0%{?with_python3}
@@ -857,7 +860,7 @@ ctest \
popd
%if 0%{?with_python3}
-pushd py3_build
+pushd %{py3dir}
# Unit && integration tests -- usual testsuite.
ctest \
--exclude-regex "${EXCLUDE_FROM_TESTS}" \
More information about the scm-commits
mailing list