diff --git a/libboost176.spec b/libboost176.spec index aef1a59..d268dce 100644 --- a/libboost176.spec +++ b/libboost176.spec @@ -2,7 +2,7 @@ %define pckmajver %(echo %version | cut -d. -f1-2 | tr . _) Name: libboost176 Version: 1.76.0 -Release: 2mamba +Release: 3mamba Summary: Free peer-reviewed portable C++ source libraries Group: System/Libraries Vendor: openmamba @@ -109,68 +109,6 @@ EXPAT_LIBPATH=%{_libdir} \ cflags="-fPIC" %endif -%ifarch disabled -cd boost_python -# Rebuild boost with Python 2 -rm -f user-config.jam - -./bootstrap.sh \ - --with-icu \ - --with-python-root=%{_prefix} \ - --with-python-version=%{python_version} \ - --with-libraries=python - -EXPAT_INCLUDE=%{_includedir} \ -EXPAT_LIBPATH=%{_libdir} \ -./b2 \ - -a \ - --prefix=%{_prefix} \ - --layout=system -d2 \ - python=2.7 \ - runtime-link=shared \ - link=shared,static \ - toolset=gcc \ - variant=release \ - threading=multi \ - debug-symbols=on \ - stage \ -%ifarch x86_64 - cflags="-fPIC" -%endif - -cd ../boost_python36 -# Rebuild boost with Python 3.6 -rm -f user-config.jam - -./bootstrap.sh \ - --with-icu \ - --with-python-root=%{_prefix} \ - --with-python-version=%{python36_version} \ - --with-libraries=python - -sed -i "s|using python.*|using python : %{python36_version} : %{_prefix} : %{python36_inc} ;|" project-config.jam -echo "using mpi ;" >> project-config.jam - -EXPAT_INCLUDE=%{_includedir} \ -EXPAT_LIBPATH=%{_libdir} \ -./b2 \ - -a \ - --prefix=%{_prefix} \ - --layout=system -d2 \ - python=3.6 \ - runtime-link=shared \ - link=shared,static \ - toolset=gcc \ - variant=release \ - threading=multi \ - debug-symbols=on \ - stage \ -%ifarch x86_64 - cflags="-fPIC" -%endif - -%endif - %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" EXPAT_INCLUDE=%{_includedir} \ @@ -196,43 +134,8 @@ for _lib in python numpy; do ln -srL %{buildroot}%{_libdir}/libboost_${_lib}3{7,}.so done -%ifarch disabled -cd boost_python -EXPAT_INCLUDE=%{_includedir} \ -EXPAT_LIBPATH=%{_libdir} \ -./b2 \ - --prefix=%{buildroot}%{_prefix} \ - --libdir=%{buildroot}%{_libdir} \ - --execprefix=%{buildroot}%{_libexecdir} \ - --includedir=%{buildroot}%{_includedir} \ - --layout=system -d2 \ - python=2.7 \ - runtime-link=shared \ - link=shared,static \ - toolset=gcc \ - variant=release \ - threading=multi \ - debug-symbols=on \ - install - -cd ../boost_python36 -EXPAT_INCLUDE=%{_includedir} \ -EXPAT_LIBPATH=%{_libdir} \ -./b2 \ - --prefix=%{buildroot}%{_prefix} \ - --libdir=%{buildroot}%{_libdir} \ - --execprefix=%{buildroot}%{_libexecdir} \ - --includedir=%{buildroot}%{_includedir} \ - --layout=system -d2 \ - python=3.6 \ - runtime-link=shared \ - link=shared,static \ - toolset=gcc \ - variant=release \ - threading=multi \ - debug-symbols=on \ - install -%endif +# Legacy package +rm -f %{buildroot}%{_libdir}/boost-python3*/mpi.so %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -297,12 +200,15 @@ EXPAT_LIBPATH=%{_libdir} \ %files -n python-boost176-py3 %defattr(-,root,root) -%{_libdir}/boost-python3*/mpi.so +#%{_libdir}/boost-python3*/mpi.so %{_libdir}/libboost_python3*.so.* %{_libdir}/libboost_mpi_python3*.so.* %{_libdir}/libboost_numpy3*.so.* %changelog +* Wed Jan 12 2022 Silvan Calarco 1.76.0-3mamba +- python-boost176-py3: remove conflicting file mpi.so + * Mon Jan 10 2022 Silvan Calarco 1.76.0-2mamba - legacy package