Hello community,
here is the log from the commit of package boost for openSUSE:Factory checked
in at 2019-11-19 12:58:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/boost (Old)
and /work/SRC/openSUSE:Factory/.boost.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "boost"
Tue Nov 19 12:58:36 2019 rev:132 rq:749250 version:1.71.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/boost/boost.changes 2019-11-06
13:47:07.555572329 +0100
+++ /work/SRC/openSUSE:Factory/.boost.new.26869/boost.changes 2019-11-19
12:58:37.554160543 +0100
@@ -1,0 +2,7 @@
+Fri Nov 8 15:21:03 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Make sure openmpi-macros-devel is not required for base flavor --
+ consolidate build_mpi/mpi macro into just one.
+- Remove BuildArch guards, no longer relevant since SuSE 11.2
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ boost.spec ++++++
--- /var/tmp/diff_new_pack.t1znOS/_old 2019-11-19 12:58:41.318158168 +0100
+++ /var/tmp/diff_new_pack.t1znOS/_new 2019-11-19 12:58:41.318158168 +0100
@@ -50,6 +50,7 @@
%define build_base 1
%define name_suffix -base
%bcond_with hpc
+%bcond_with mpi
%endif
%if "@BUILD_FLAVOR@" == "extra"
@@ -57,6 +58,11 @@
%define name_suffix -extra
%bcond_without python3
%bcond_without python2
+%ifarch ia64 hppa
+%bcond_with mpi
+%else
+%bcond_without mpi
+%endif
%endif
%if "@BUILD_FLAVOR@" == "gnu-hpc"
@@ -84,7 +90,7 @@
%if %{with ringdisabled}
ExclusiveArch: do-not-build
%else
-ExcludeArch: s390x %{ix86} ppc64 ppc64le
+ExcludeArch: s390x %{ix86} ppc64 ppc64le ia64 hppa
%endif
%endif
@@ -101,15 +107,10 @@
%if %{with ringdisabled}
ExclusiveArch: do-not-build
%else
-ExcludeArch: s390x %{ix86} ppc64 ppc64le
+ExcludeArch: s390x %{ix86} ppc64 ppc64le ia64 hppa
%endif
%endif
-%ifarch ia64 hppa
-%bcond_with build_mpi
-%else
-%bcond_without build_mpi
-%endif
# Python NumPy library is only available on Leap 42.1 OpenSUSE onward
# and is not availble in SLE
%if 0%{?suse_version} >= 1330 || 0%{?is_opensuse}
@@ -233,7 +234,7 @@
Requires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc
%endif
%else
-%if %{with build_mpi}
+%if %{with mpi}
BuildRequires: openmpi-macros-devel
%endif
%endif
@@ -268,9 +269,7 @@
Summary: Boost License
Group: Development/Libraries/C and C++
Provides: boost-license = %{version}-%{release}
-%if 0%{?suse_version} >= 1120
BuildArch: noarch
-%endif
%description -n boost-license%{library_version}
This package contains the license boost is provided under.
@@ -311,7 +310,7 @@
%if %{with boost_fiber}
Requires: libboost_fiber%{library_version}-devel
%endif
-%if %{with build_mpi}
+%if %{with mpi}
Requires: libboost_graph_parallel%{library_version}-devel
Requires: libboost_mpi%{library_version}-devel
%endif
@@ -375,9 +374,7 @@
%package -n %{package_name}-doc-html
Summary: HTML documentation for the Boost C++ Libraries
Group: Development/Libraries/C and C++
-%if 0%{?suse_version} >= 1120
BuildArch: noarch
-%endif
%description -n %{package_name}-doc-html
This package contains the documentation of the boost dynamic libraries
@@ -386,9 +383,7 @@
%package doc-man
Summary: Man documentation for the Boost C++ Libraries
Group: Development/Libraries/C and C++
-%if 0%{?suse_version} >= 1120
BuildArch: noarch
-%endif
%description doc-man
This package contains the documentation of the boost dynamic libraries
@@ -397,9 +392,7 @@
%package -n %{package_name}-doc-pdf
Summary: PDF documentation for the Boost C++ Libraries
Group: Development/Libraries/C and C++
-%if 0%{?suse_version} >= 1120
BuildArch: noarch
-%endif
%description -n %{package_name}-doc-pdf
This package contains the documentation of the boost dynamic libraries
@@ -705,7 +698,7 @@
%package -n libboost_mpi%{library_version}-devel
Summary: Development headers for Boost.MPI library
Group: Development/Libraries/C and C++
-%if %{with build_mpi}
+%if %{with mpi}
%{?openmpi_devel_requires}
%endif
Requires: libboost_graph%{library_version}-devel
@@ -1256,7 +1249,7 @@
# MPI builds a python module.
cat << \EOF >.build
export PY_LIBRARIES_FLAGS="--with-python"
-%if %{with build_mpi}
+%if %{with mpi}
PY_LIBRARIES_FLAGS+=" --with-mpi"
%endif
@@ -1264,13 +1257,13 @@
export LIBRARIES_FLAGS="--with-system"
# Dummy entry replaced with real libraries, if we build something
-%if %{with build_mpi}
+%if %{with mpi}
LIBRARIES_FLAGS=" --with-graph_parallel"
%endif
EOF
-%if %{with build_mpi}
+%if %{with mpi}
# Set PATH, MANPATH and LD_LIBRARY_PATH for mpi
%if %{with hpc}
module load gnu %mpi_flavor
@@ -1312,7 +1305,7 @@
:
:
;
-%if %{with build_mpi}
+%if %{with mpi}
using mpi ;
%endif
EOF
@@ -1343,7 +1336,7 @@
: .%{py3_soflags}
: %{py3_abiflags}
;
-%if %{with build_mpi}
+%if %{with mpi}
using mpi ;
%endif
EOF
@@ -1370,7 +1363,7 @@
%endif
# needed to get graph_parallel built
-%if %{with build_mpi}
+%if %{with mpi}
echo 'using mpi ;' >> ./user-config.jam
%endif
@@ -1423,7 +1416,7 @@
%if ! %{build_base}
-%if %{with build_mpi}
+%if %{with mpi}
# Set PATH, MANPATH and LD_LIBRARY_PATH for mpi
%if %{with hpc}
module load gnu %mpi_flavor
@@ -1652,7 +1645,7 @@
%endif
%endif
-%if %{with build_mpi}
+%if %{with mpi}
%post -n libboost_mpi%{library_version} -p /sbin/ldconfig
%post -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig
%if %{with python2}
@@ -1710,7 +1703,7 @@
%endif
%endif
-%if %{with build_mpi}
+%if %{with mpi}
%postun -n libboost_mpi%{library_version} -p /sbin/ldconfig
%postun -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig
%if %{with python2}
@@ -1916,7 +1909,7 @@
%if ! %{build_base}
-%if %{with build_mpi}
+%if %{with mpi}
%files -n libboost_mpi%{library_version}
%{package_libdir}/libboost_mpi.so.%{version}
@@ -1975,7 +1968,7 @@
%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so
%endif # with python3
-%endif # with build_mpi
+%endif # with mpi
%if %{with python2}
%files -n libboost_python-py2_7-%{library_version}
