3:46 p.m.
The package rpms/shogun.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/shogun.git/commit/?id=2932484a467....
Change:
-%ifarch %{ix86}
Thanks.
Full change:
============
commit 2932484a4675dbc53bf55cf6420dbf3f8aaaf7ec
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Sun Sep 30 17:54:55 2018 +0200
Remove python2 subpackage (#1629747)
diff --git a/shogun.spec b/shogun.spec
index b471c2c..a7ce76b 100644
--- a/shogun.spec
+++ b/shogun.spec
@@ -38,15 +38,17 @@
# Perl is not fully implemented by upstream, yet. Disabling.
%bcond_with perl
-%bcond_without python
# There's no Python3 on older distributions.
+# The conditionals are designed to have py2 OR py3, not both
%if 0%{?fedora} || 0%{?rhel} >= 8
%bcond_without python3
-%global python %{__python3}
+%bcond_with python2
+%global __python %{__python3}
%else # 0%%{?fedora} || 0%%{?rhel} >= 8
%bcond_with python3
-%global python %{__python2}
+%bcond_without python2
+%global __python %{__python2}
%endif # 0%%{?fedora} || 0%%{?rhel} >= 8
%bcond_without r
@@ -143,7 +145,7 @@ on Shogun's development activity can be found on ohloh.
Name: shogun
Version: %{branch}.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Unified and efficient Machine Learning since 1999
License: GPLv3+ and BSD and GPLv2+ and (GPLv2+ or LGPLv2+) and GPLv3 and LGPLv2+ and MIT
and (Public Domain or GPLv3+)
@@ -190,7 +192,12 @@ BuildRequires: ocl-icd-devel
BuildRequires: opencl-headers
BuildRequires: opencv-devel
BuildRequires: protobuf-devel
+%if %{with python2}
BuildRequires: python2-ply
+%endif
+%if %{with python3}
+BuildRequires: python3-ply
+%endif
BuildRequires: qd-devel
BuildRequires: %{name}-data
BuildRequires: snappy-devel
@@ -287,10 +294,9 @@ This package contains files needed for development with %{name}.
%doc %{_pkgdocdir}/mem.%{?__isa}%{?dist}.log
%endif # %%{with memtest}
%if %{with testsuite}
+%if %{with python3} || %{with python2}
%doc %{_pkgdocdir}/unit.%{?__isa}%{?dist}.log
-%if %{with python3}
-%doc %{_pkgdocdir}/unit.py3.%{?__isa}%{?dist}.log
-%endif # %%{with python3}
+%endif # %%{with python3} || %%{with python2}
%endif # %%{with testsuite}
%{_includedir}/%{name}
%{_libdir}/cmake
@@ -310,9 +316,16 @@ BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: hardlink
BuildRequires: pandoc
+%if %{with python2}
BuildRequires: python2-sphinx
BuildRequires: python2-sphinx-bootstrap-theme
BuildRequires: python2-sphinxcontrib-bibtex
+%endif
+%if %{with python3}
+BuildRequires: python3-sphinx
+BuildRequires: python3-sphinx-bootstrap-theme
+BuildRequires: python3-sphinxcontrib-bibtex
+%endif
# doc-cn-pkg is gone with 5.0.0.
Obsoletes: %{name}-doc-cn <= 6.0.0
@@ -371,7 +384,7 @@ This package contains the Java-plugin for %{name}.
%if %{with lua}
%package -n lua-%{name}
%{!?lua_ver: %global lua_ver %(%{_bindir}/lua -e 'print(string.sub(_VERSION, 5))'
|| echo 0)}
-%{!?luanext: %global luanext %(%{python} -c'print(%{lua_ver} + 0.1)' || echo 0)}
+%{!?luanext: %global luanext %(%{__python} -c'print(%{lua_ver} + 0.1)' || echo
0)}
%global lualibdir %{_libdir}/lua/%{lua_ver}
Summary: LUA-plugin for %{name}
@@ -471,7 +484,7 @@ This package contains the Perl-plugin for %{name}.
###############################################################################
-%if %{with python}
+%if %{with python2}
%package -n python2-%{name}
Summary: Python-plugin for %{name}
@@ -498,7 +511,7 @@ This package contains the Python-plugin for %{name}.
%doc %{_pkgdocdir}/examples/python*
%doc %{_pkgdocdir}/ipython-notebooks
%{python2_sitearch}/*
-%endif # %%{with python}
+%endif # %%{with python2}
###############################################################################
@@ -646,10 +659,10 @@ export CXXFLAGS="%{optflags_shogun}"
# because CMake hardcodes them when creating the Makefiles and it's cache.
# We need to export a customized PYTHONPATH for testsuite.
-PYTHONPATH="$PWD/%{_cmake_testinstall_dir}%{python2_sitearch}/%{name}"
+PYTHONPATH="$PWD/%{_cmake_testinstall_dir}%{python_sitearch}/%{name}"
PYTHONPATH="${PYTHONPATH}:$PWD/%{_cmake_testinstall_dir}%{python2_sitearch}"
PYTHONPATH="${PYTHONPATH}:$PWD/examples/undocumented/python_modular"
-export PYTHONPATH="${PYTHONPATH}:%{python2_sitearch}:%{python2_sitelib}"
+export PYTHONPATH="${PYTHONPATH}:%{python_sitearch}:%{python_sitelib}"
# We need to export a customized R_LIBS_USER for testsuite.
export R_LIBS_USER="$PWD/%{_cmake_testinstall_dir}%{_libdir}/R/library"
@@ -697,9 +710,9 @@ export TMPDIR="$PWD/%{_cmake_build_subdir}/tmp"
%if %{with perl}
-DPerlModular=ON \
%endif # %%{with perl}
-%if %{with python}
+%if %{with python3} || %{with python2}
-DPythonModular=ON \
-%endif # %%{with python}
+%endif # %%{with python3} || %%{with python2}
%if %{with r}
-DRModular=ON \
%endif # %%{with r}
@@ -723,68 +736,17 @@ export TMPDIR="$PWD/%{_cmake_build_subdir}/tmp"
-DENABLE_TESTING=ON \
%endif # %%{with testsuite}
-DENABLE_CCACHE=ON \
- -DPYTHON_EXECUTABLE="%{__python2}" \
+ -DPYTHON_EXECUTABLE="%{__python}" \
..
%{__make} examples
popd
-# Build the Python3-version.
-%if %{with python3}
-PYTHONPATH="$PWD/%{_cmake_testinstall_dir}%{python3_sitearch}/%{name}"
-PYTHONPATH="${PYTHONPATH}:$PWD/%{_cmake_testinstall_dir}%{python3_sitearch}"
-PYTHONPATH="${PYTHONPATH}:$PWD/examples/undocumented/python_modular"
-export PYTHONPATH="${PYTHONPATH}:%{python3_sitearch}:%{python3_sitelib}"
-
-%{__mkdir} -p %{_cmake_build_subdir}-py3/tmp
-pushd %{_cmake_build_subdir}-py3
-export TMPDIR="$PWD/%{_cmake_build_subdir}-py3/tmp"
-%cmake \
- -DCMAKE_BUILD_TYPE=DISTRIBUTION \
-%ifarch %{ix86}
- -DDISABLE_SSE=ON \
-%endif # arch %%{ix86}
-%if 0
-# %%if 0%%{?fedora} >= 21 || 0%%{?rhel} >= 8
- -DATLAS_LAPACK=%{_libdir}/atlas/libtatlas.so \
- -DATLAS_LIBRARIES=%{_libdir}/atlas/libtatlas.so \
-%else # 0%%{?fedora} >= 21 || 0%%{?rhel} >= 8
- -DUSE_ORIGINAL_LAPACK=ON \
-%endif # 0%%{?fedora} >= 21 || 0%%{?rhel} >= 8
-%if %{with opencv}
- -DOpenCV=ON \
-%endif # %%{with opencv}
-%if %{with reduce_swig_debug}
- -DREDUCE_SWIG_DEBUG=ON \
-%endif # %%{with reduce_swig_debug}
-%if !%{with svmlight}
- -DUSE_SVMLIGHT=OFF \
-%endif # !%%{with svmlight}
-%if %{with testsuite}
- -DBUILD_DASHBOARD_REPORTS=ON \
- -DENABLE_PYTHON_DEBUG=ON \
- -DENABLE_TESTING=ON \
-%endif # %%{with testsuite}
- -DBUNDLE_EIGEN=OFF \
- -DBUNDLE_NLOPT=OFF \
- -DBUNDLE_JSON=OFF \
- -DENABLE_CCACHE=ON \
- -DPythonModular=ON \
- -DPYTHON_EXECUTABLE=%{__python3} \
- ..
-%{__make} examples
-popd
-%endif # %%{with python3}
-
unset LD_LIBRARY_PATH
unset PYTHONPATH
unset R_LIBS_USER
export TMPDIR="$PWD/%{_cmake_build_subdir}/tmp"
%make_build -C %{_cmake_build_subdir}
-%if %{with python3}
-export TMPDIR="$PWD/%{_cmake_build_subdir}-py3/tmp"
-%make_build -C %{_cmake_build_subdir}-py3
-%endif # %%{with python3}
unset TMPDIR
%make_build -C %{_cmake_build_subdir} doc
@@ -794,16 +756,6 @@ unset TMPDIR
# We install to custom location first. This will be needed by testsuite, too.
CUSTOM_INSTALL_DIR="$PWD/%{_cmake_testinstall_dir}"
-# Install the Python3-version first.
-%if %{with python3}
-%make_install -C %{_cmake_build_subdir}-py3 DESTDIR=${CUSTOM_INSTALL_DIR}
-
-# Remove the installed headers and libshogun.so
-%{__rm} -fr ${CUSTOM_INSTALL_DIR}%{_includedir} \
- ${CUSTOM_INSTALL_DIR}%{_libdir}/cmake \
- ${CUSTOM_INSTALL_DIR}%{_libdir}/lib%{name}.so*
-%endif # %%{with python3}
-
%make_install -C %{_cmake_build_subdir} DESTDIR=${CUSTOM_INSTALL_DIR}
# Add pkg-config file.
@@ -902,11 +854,7 @@ done
/sbin/hardlink -cfv %{buildroot}%{_pkgdocdir}
# Create log-files for testsuite
-/bin/touch %{buildroot}%{_pkgdocdir}/unit.%{?__isa}%{?dist}.log \
-%if %{with python3}
- %{buildroot}%{_pkgdocdir}/unit.py3.%{?__isa}%{?dist}.log \
-%endif # %%{with python3}
-;
+/bin/touch %{buildroot}%{_pkgdocdir}/unit.%{?__isa}%{?dist}.log
###############################################################################
@@ -947,28 +895,14 @@ EXCLUDE_FROM_TESTS="$(echo ${EXCLUDE_FROM_TESTS} | %{__sed}
-e's!^|!!' -e's!|$!!
--output-log %{buildroot}%{_pkgdocdir}/unit.%{?__isa}%{?dist}.log \
--output-on-failure || :
popd
-
-%if %{with python3}
-# We don't need duplicated tests already run in other build.
-EXCLUDE_FROM_TESTS="^lib%{name}-.*|^unit-.*|.*cpp.*|${EXCLUDE_FROM_TESTS}"
-
-# Export the list.
-EXCLUDE_FROM_TESTS="$(echo ${EXCLUDE_FROM_TESTS} | %{__sed} -e's!^|!!'
-e's!|$!!')"
-
-pushd %{_cmake_build_subdir}-py3
-# Unit && integration tests -- usual testsuite.
-%{_bindir}/ctest \
- --exclude-regex "${EXCLUDE_FROM_TESTS}" \
- --timeout 5400 \
- --output-log %{buildroot}%{_pkgdocdir}/unit.py3.%{?__isa}%{?dist}.log \
- --output-on-failure || :
-popd
-%endif # %%{with python3}
%endif # %%{with testsuite}
###############################################################################
%changelog
+* Sun Sep 30 2018 Miro Hronok <mhroncok(a)redhat.com> - 6.0.0-15
+- Remove python2 subpackage (#1629747)
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild