Re-add CMake file
Fixes rhbz#1898979
This commit is contained in:
parent
36115b3780
commit
19a004c283
17
boost.spec
17
boost.spec
@ -42,7 +42,7 @@ Name: boost
|
|||||||
%global real_name boost
|
%global real_name boost
|
||||||
Summary: The free peer-reviewed portable C++ source libraries
|
Summary: The free peer-reviewed portable C++ source libraries
|
||||||
Version: 1.78.0
|
Version: 1.78.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: Boost and MIT and Python
|
License: Boost and MIT and Python
|
||||||
|
|
||||||
# Replace each . with _ in %%{version}
|
# Replace each . with _ in %%{version}
|
||||||
@ -842,9 +842,6 @@ mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/boost-python%{python3_version}/mpi.so \
|
|||||||
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
|
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
|
||||||
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_numpy*
|
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}
|
%{_openmpi_unload}
|
||||||
export PATH=/bin${PATH:+:}$PATH
|
export PATH=/bin${PATH:+:}$PATH
|
||||||
%endif
|
%endif
|
||||||
@ -871,9 +868,6 @@ mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/boost-python%{python3_version}/mpi.so \
|
|||||||
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
|
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
|
||||||
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_numpy*
|
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}
|
%{_mpich_unload}
|
||||||
export PATH=/bin${PATH:+:}$PATH
|
export PATH=/bin${PATH:+:}$PATH
|
||||||
%endif
|
%endif
|
||||||
@ -899,9 +893,6 @@ echo ============================= install serial ==================
|
|||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so
|
rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so
|
||||||
install -p -m 644 $(basename %{SOURCE1}) $RPM_BUILD_ROOT%{_libdir}/
|
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 ==================
|
echo ============================= install Boost.Build ==================
|
||||||
(cd tools/build
|
(cd tools/build
|
||||||
./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
|
./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
|
||||||
@ -1164,6 +1155,7 @@ fi
|
|||||||
%files devel
|
%files devel
|
||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
%{_includedir}/%{name}
|
%{_includedir}/%{name}
|
||||||
|
%{_libdir}/cmake
|
||||||
%{_libdir}/libboost_atomic.so
|
%{_libdir}/libboost_atomic.so
|
||||||
%{_libdir}/libboost_chrono.so
|
%{_libdir}/libboost_chrono.so
|
||||||
%{_libdir}/libboost_container.so
|
%{_libdir}/libboost_container.so
|
||||||
@ -1231,6 +1223,7 @@ fi
|
|||||||
|
|
||||||
%files openmpi-devel
|
%files openmpi-devel
|
||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
|
%{_libdir}/openmpi/lib/cmake
|
||||||
%{_libdir}/openmpi/lib/libboost_mpi.so
|
%{_libdir}/openmpi/lib/libboost_mpi.so
|
||||||
%{_libdir}/openmpi/lib/libboost_graph_parallel.so
|
%{_libdir}/openmpi/lib/libboost_graph_parallel.so
|
||||||
|
|
||||||
@ -1262,6 +1255,7 @@ fi
|
|||||||
|
|
||||||
%files mpich-devel
|
%files mpich-devel
|
||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
|
%{_libdir}/mpich/lib/cmake
|
||||||
%{_libdir}/mpich/lib/libboost_mpi.so
|
%{_libdir}/mpich/lib/libboost_mpi.so
|
||||||
%{_libdir}/mpich/lib/libboost_graph_parallel.so
|
%{_libdir}/mpich/lib/libboost_graph_parallel.so
|
||||||
|
|
||||||
@ -1299,6 +1293,9 @@ fi
|
|||||||
%{_mandir}/man1/b2.1*
|
%{_mandir}/man1/b2.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 14 2022 Laurent Rineau <laurent.rineau@cgal.org> - 1.78.0-2
|
||||||
|
- Re-add the CMake config file provided by Boost
|
||||||
|
|
||||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.78.0-1
|
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.78.0-1
|
||||||
- Rebuilt for Python 3.11
|
- Rebuilt for Python 3.11
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user