From 7fdbd63a01d96bbe89136ef4dc3dbf91086caa43630981d49b917a0356f12933 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 12 Mar 2020 10:44:02 +0000 Subject: [PATCH] Accepting request 784249 from home:adamm:branches:devel:libraries:c_c++ - Fix packaging errors in cases where python2 is disabled and unavailable. OBS-URL: https://build.opensuse.org/request/show/784249 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=251 --- boost.changes | 6 ++++++ boost.spec | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/boost.changes b/boost.changes index 1946cb1..37a4f7d 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 12 10:18:33 UTC 2020 - Adam Majer + +- Fix packaging errors in cases where python2 is disabled and + unavailable. + ------------------------------------------------------------------- Fri Feb 28 13:54:37 UTC 2020 - Egbert Eich diff --git a/boost.spec b/boost.spec index a2e3c15..cb9109f 100644 --- a/boost.spec +++ b/boost.spec @@ -1574,9 +1574,9 @@ rm -r %{buildroot}%{package_libdir}/cmake/boost_headers-%{version} rm -r %{buildroot}%{package_libdir}/cmake/boost_{w,}serialization-%{version} rm -r %{buildroot}%{package_libdir}/cmake/mpi-%{version} -rm -r %{buildroot}%{package_libdir}/libboost_numpy.so{,.%{version}} -rm -r %{buildroot}%{package_libdir}/libboost_mpi_python.so.%{version} -rm -r %{buildroot}%{package_libdir}/libboost_python.so.%{version} +rm -rf %{buildroot}%{package_libdir}/libboost_numpy.so{,.%{version}} +rm -rf %{buildroot}%{package_libdir}/libboost_mpi_python.so.%{version} +rm -rf %{buildroot}%{package_libdir}/libboost_python.so.%{version} rm -r %{buildroot}%{package_includedir}/boost rm %{buildroot}%{package_libdir}/libboost_{w,}serialization* @@ -1975,8 +1975,10 @@ EOF %{package_libdir}/libboost_mpi_python-py3.so.%{version} %files -n libboost_mpi_python-py3-%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_mpi_python-%{version} -##%{package_libdir}/cmake/boost_mpi_python-%{version}/* +%if ! %{with python2} +%dir %{package_libdir}/cmake/boost_mpi_python-%{version} +%{package_libdir}/cmake/boost_mpi_python-%{version}/* +%endif %{package_libdir}/libboost_mpi_python-py3.so %files -n python3-boost_parallel_mpi%{library_version}