| |
@@ -42,7 +42,7 @@
|
| |
%global real_name boost
|
| |
Summary: The free peer-reviewed portable C++ source libraries
|
| |
Version: 1.76.0
|
| |
- Release: 11%{?dist}
|
| |
+ Release: 12%{?dist}
|
| |
License: Boost and MIT and Python
|
| |
|
| |
# Replace each . with _ in %%{version}
|
| |
@@ -845,9 +845,6 @@
|
| |
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
|
| |
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_numpy*
|
| |
|
| |
- # Remove cmake files (some of these are duplicates of the generic bits anyway).
|
| |
- rm -r ${RPM_BUILD_ROOT}${MPI_HOME}/lib/cmake
|
| |
-
|
| |
%{_openmpi_unload}
|
| |
export PATH=/bin${PATH:+:}$PATH
|
| |
%endif
|
| |
@@ -874,9 +871,6 @@
|
| |
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
|
| |
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_numpy*
|
| |
|
| |
- # Remove cmake files (some of these are duplicates of the generic bits anyway).
|
| |
- rm -r ${RPM_BUILD_ROOT}${MPI_HOME}/lib/cmake
|
| |
-
|
| |
%{_mpich_unload}
|
| |
export PATH=/bin${PATH:+:}$PATH
|
| |
%endif
|
| |
@@ -902,9 +896,6 @@
|
| |
rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so
|
| |
install -p -m 644 $(basename %{SOURCE1}) $RPM_BUILD_ROOT%{_libdir}/
|
| |
|
| |
- # Remove cmake files until we know somebody wants them.
|
| |
- rm -r $RPM_BUILD_ROOT/%{_libdir}/cmake
|
| |
-
|
| |
echo ============================= install Boost.Build ==================
|
| |
(cd tools/build
|
| |
./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
|
| |
@@ -1167,6 +1158,7 @@
|
| |
%files devel
|
| |
%license LICENSE_1_0.txt
|
| |
%{_includedir}/%{name}
|
| |
+ %{_libdir}/cmake
|
| |
%{_libdir}/libboost_atomic.so
|
| |
%{_libdir}/libboost_chrono.so
|
| |
%{_libdir}/libboost_container.so
|
| |
@@ -1234,6 +1226,7 @@
|
| |
|
| |
%files openmpi-devel
|
| |
%license LICENSE_1_0.txt
|
| |
+ %{_libdir}/openmpi/lib/cmake
|
| |
%{_libdir}/openmpi/lib/libboost_mpi.so
|
| |
%{_libdir}/openmpi/lib/libboost_graph_parallel.so
|
| |
|
| |
@@ -1265,6 +1258,7 @@
|
| |
|
| |
%files mpich-devel
|
| |
%license LICENSE_1_0.txt
|
| |
+ %{_libdir}/mpich/lib/cmake
|
| |
%{_libdir}/mpich/lib/libboost_mpi.so
|
| |
%{_libdir}/mpich/lib/libboost_graph_parallel.so
|
| |
|
| |
@@ -1302,6 +1296,9 @@
|
| |
%{_mandir}/man1/b2.1*
|
| |
|
| |
%changelog
|
| |
+ * Fri Jun 10 2022 Laurent Rineau <laurent.rineau@cgal.org> - 1.76.0-12
|
| |
+ - Re-add the CMake config file provided by Boost
|
| |
+
|
| |
* Tue Apr 26 2022 Thomas Rodgers <trodgers@redhat.com> - 1.76.0-11
|
| |
- Add BuildRequires: libzstd-devel to fix (#2042336)
|
| |
|
| |
rineau
commented a year ago
Fix bug #1898979: I want the cmake files
This PR applies to
f36but the patch applies easily againstrawhideas well (with a merge conflict for the%changelog).Scratch-build: https://koji.fedoraproject.org/koji/taskinfo?taskID=88101499
You can check that the bug at https://lists.boost.org/Archives/boost/2020/04/248814.php is fixed. Now the CMake files have that logic: