diff --git a/boost.changes b/boost.changes index 2f183ad..c30b654 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 17 10:42:56 UTC 2020 - Adam Majer + +- Replace hardcoded python3.8 path in the spec file +- Add Conflicts with Boost 1.66 version in SLE15 since that version + uses different Provides. + ------------------------------------------------------------------- Mon Dec 14 15:14:58 UTC 2020 - Adam Majer diff --git a/boost.spec b/boost.spec index e2af794..52de193 100644 --- a/boost.spec +++ b/boost.spec @@ -270,6 +270,7 @@ Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_headers-devel < %{version} Conflicts: libboost_headers-devel-impl +Conflicts: libboost_headers1_66_0-devel Provides: libboost_headers-devel-impl = %{version} %description -n libboost_headers%{library_version}-devel @@ -401,6 +402,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_atomic-devel-impl +Conflicts: libboost_atomic1_66_0-devel Provides: libboost_atomic-devel-impl = %{version} %description -n libboost_atomic%{library_version}-devel @@ -425,6 +427,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_container-devel-impl +Conflicts: libboost_container1_66_0-devel Provides: libboost_container-devel-impl = %{version} %description -n libboost_container%{library_version}-devel @@ -452,6 +455,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_context-devel-impl +Conflicts: libboost_context1_66_0-devel Provides: libboost_context-devel-impl = %{version} %description -n libboost_context%{library_version}-devel @@ -475,6 +479,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_system%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: libboost_contract-devel-impl +Conflicts: libboost_contract1_66_0-devel Provides: libboost_contract-devel-impl = %{version} %description -n libboost_contract%{library_version}-devel @@ -500,6 +505,7 @@ Requires: libboost_thread%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_coroutine-devel-impl +Conflicts: libboost_coroutine1_66_0-devel Provides: libboost_coroutine-devel-impl = %{version} %description -n libboost_coroutine%{library_version}-devel @@ -523,6 +529,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_date_time-devel-impl +Conflicts: libboost_date_time1_66_0-devel Provides: libboost_date_time-devel-impl = %{version} %description -n libboost_date_time%{library_version}-devel @@ -547,6 +554,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_fiber-devel-impl +Conflicts: libboost_fiber1_66_0-devel Provides: libboost_fiber-devel-impl = %{version} %description -n libboost_fiber%{library_version}-devel @@ -570,6 +578,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_filesystem-devel-impl +Conflicts: libboost_filesystem1_66_0-devel Provides: libboost_filesystem-devel-impl = %{version} %description -n libboost_filesystem%{library_version}-devel @@ -594,6 +603,7 @@ Requires: libboost_regex%{library_version}-devel = %{version} Requires: libstdc++-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_graph-devel-impl +Conflicts: libboost_graph1_66_0-devel Provides: libboost_graph-devel-impl = %{version} %description -n libboost_graph%{library_version}-devel @@ -617,6 +627,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_iostreams%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_iostreams-devel-impl +Conflicts: libboost_iostreams1_66_0-devel Provides: libboost_iostreams-devel-impl = %{version} %description -n libboost_iostreams%{library_version}-devel @@ -644,6 +655,7 @@ Requires: libboost_regex%{library_version}-devel = %{version} Requires: libboost_thread%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_log-devel-impl +Conflicts: libboost_log1_66_0-devel Provides: libboost_log-devel-impl = %{version} %description -n libboost_log%{library_version}-devel @@ -667,6 +679,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_math%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_math-devel-impl +Conflicts: libboost_math1_66_0-devel Provides: libboost_math-devel-impl = %{version} %description -n libboost_math%{library_version}-devel @@ -692,6 +705,7 @@ Requires: libboost_mpi%{library_version} = %{version} Requires: libboost_serialization%{library_version}-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_mpi-devel-impl +Conflicts: libboost_mpi1_66_0-devel Provides: libboost_mpi-devel-impl = %{version} %if %{with python3} Requires: libboost_python-py3-%{library_version}-devel @@ -716,6 +730,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_mpi%{library_version}-devel = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_graph_parallel-devel-impl +Conflicts: libboost_graph_parallel1_66_0-devel Provides: libboost_graph_parallel-devel-impl = %{version} %description -n libboost_graph_parallel%{library_version}-devel @@ -755,6 +770,7 @@ Requires: libboost_mpi_python-py3-%{library_version} = %{version} Requires: libboost_python-py3-%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_mpi_python3-devel-impl +Conflicts: libboost_mpi_python-py3-1_66_0-devel Provides: libboost_mpi_python3-devel-impl = %{version} %description -n libboost_mpi_python-py3-%{library_version}-devel @@ -785,6 +801,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_test%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_test-devel-impl +Conflicts: libboost_test1_66_0-devel Provides: libboost_test-devel-impl = %{version} %description -n libboost_test%{library_version}-devel @@ -807,6 +824,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_program_options%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_program_options-devel-impl +Conflicts: libboost_program_options1_66_0-devel Provides: libboost_program_options-devel-impl = %{version} %description -n libboost_program_options%{library_version}-devel @@ -829,6 +847,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_python-py3-%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_python3-devel-impl +Conflicts: libboost_python-py3-1_66_0-devel Provides: libboost_python3-devel-impl = %{version} %description -n libboost_python-py3-%{library_version}-devel @@ -851,6 +870,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_numpy-py3-%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_numpy3-devel-impl +Conflicts: libboost_numpy-py3-1_66_0-devel Provides: libboost_numpy3-devel-impl = %{version} %description -n libboost_numpy-py3-%{library_version}-devel @@ -872,6 +892,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_serialization%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_serialization-devel-impl +Conflicts: libboost_serialization1_66_0-devel Provides: libboost_serialization-devel-impl = %{version} %description -n libboost_serialization%{library_version}-devel @@ -892,6 +913,7 @@ Group: Development/Libraries/C and C++ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_stacktrace%{library_version} = %{version} Conflicts: libboost_stacktrace-devel-impl +Conflicts: libboost_stacktrace1_66_0-devel Provides: libboost_stacktrace-devel-impl = %{version} %description -n libboost_stacktrace%{library_version}-devel @@ -914,6 +936,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_system%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_system-devel-impl +Conflicts: libboost_system1_66_0-devel Provides: libboost_system-devel-impl = %{version} %description -n libboost_system%{library_version}-devel @@ -937,6 +960,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_thread%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_thread-devel-impl +Conflicts: libboost_thread1_66_0-devel Provides: libboost_thread-devel-impl = %{version} %description -n libboost_thread%{library_version}-devel @@ -962,6 +986,7 @@ Requires: libboost_thread%{library_version}-devel = %{version} Requires: libboost_wave%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_wave-devel-impl +Conflicts: libboost_wave1_66_0-devel Provides: libboost_wave-devel-impl = %{version} %description -n libboost_wave%{library_version}-devel @@ -983,6 +1008,7 @@ Requires: libboost_regex%{library_version} = %{version} Requires: libicu-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_regex-devel-impl +Conflicts: libboost_regex1_66_0-devel Provides: libboost_regex-devel-impl = %{version} %description -n libboost_regex%{library_version}-devel @@ -1004,6 +1030,7 @@ Requires: libboost_random%{library_version} = %{version} Requires: libboost_system%{library_version}-devel = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_random-devel-impl +Conflicts: libboost_random1_66_0-devel Provides: libboost_random-devel-impl = %{version} %description -n libboost_random%{library_version}-devel @@ -1024,6 +1051,7 @@ Requires: libboost_chrono%{library_version} = %{version} Requires: libboost_headers%{library_version}-devel = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_chrono-devel-impl +Conflicts: libboost_chrono1_66_0-devel Provides: libboost_chrono-devel-impl = %{version} %description -n libboost_chrono%{library_version}-devel @@ -1048,6 +1076,7 @@ Requires: libboost_thread%{library_version}-devel = %{version} Requires: libicu-devel Conflicts: boost-devel < 1.63 Conflicts: libboost_locale-devel-impl +Conflicts: libboost_locale1_66_0-devel Provides: libboost_locale-devel-impl = %{version} %description -n libboost_locale%{library_version}-devel @@ -1069,6 +1098,7 @@ Requires: libboost_headers%{library_version}-devel = %{version} Requires: libboost_timer%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_timer-devel-impl +Conflicts: libboost_timer1_66_0-devel Provides: libboost_timer-devel-impl = %{version} %description -n libboost_timer%{library_version}-devel @@ -1092,6 +1122,7 @@ Requires: libboost_thread%{library_version}-devel = %{version} Requires: libboost_type_erasure%{library_version} = %{version} Conflicts: boost-devel < 1.63 Conflicts: libboost_type_erasure-devel-impl +Conflicts: libboost_type_erasuse1_66_0-devel Provides: libboost_type_erasure-devel-impl = %{version} %description -n libboost_type_erasure%{library_version}-devel @@ -1366,8 +1397,8 @@ install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python3_sitearc install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost/parallel install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost %if ! %{with hpc} -mv %{buildroot}%{_libdir}/boost-python3.8/mpi.%{py3_soflags}.so %{buildroot}%{package_python3_sitearch}/mpi.%{py3_soflags}.so -rmdir %{buildroot}%{_libdir}/boost-python3.8 +mv %{buildroot}%{_libdir}/boost-python3.*/mpi.%{py3_soflags}.so %{buildroot}%{package_python3_sitearch}/mpi.%{py3_soflags}.so +rmdir %{buildroot}%{_libdir}/boost-python3.* %endif %endif