From cbb07966fa11f2ef943eb1830c38c672dbd34829 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Tue, 1 Nov 2022 15:46:37 +0800 Subject: [PATCH] optimise spec file --- boost.spec | 198 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 121 insertions(+), 77 deletions(-) diff --git a/boost.spec b/boost.spec index 897e8b5..846214b 100644 --- a/boost.spec +++ b/boost.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global boost_docdir __tmp_docdir %global boost_examplesdir __tmp_examplesdir @@ -57,39 +57,39 @@ Source2: b2.1 # and it's not a big burden to have interested parties install them explicitly. # The subpackages that don't install shared libraries are also not pulled in # (b2, build, doc, doctools, examples, static). -Requires: %{name}-atomic%{?_isa} = %{version}-%{release} -Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Requires: %{name}-container%{?_isa} = %{version}-%{release} -Requires: %{name}-contract%{?_isa} = %{version}-%{release} +Requires: %{name}-atomic = %{version}-%{release} +Requires: %{name}-chrono = %{version}-%{release} +Requires: %{name}-container = %{version}-%{release} +Requires: %{name}-contract = %{version}-%{release} %if %{with context} -Requires: %{name}-context%{?_isa} = %{version}-%{release} -Requires: %{name}-coroutine%{?_isa} = %{version}-%{release} +Requires: %{name}-context = %{version}-%{release} +Requires: %{name}-coroutine = %{version}-%{release} %endif -Requires: %{name}-date-time%{?_isa} = %{version}-%{release} +Requires: %{name}-date-time = %{version}-%{release} %if %{with context} -Requires: %{name}-fiber%{?_isa} = %{version}-%{release} +Requires: %{name}-fiber = %{version}-%{release} %endif -Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} -Requires: %{name}-graph%{?_isa} = %{version}-%{release} -Requires: %{name}-iostreams%{?_isa} = %{version}-%{release} -Requires: %{name}-locale%{?_isa} = %{version}-%{release} -Requires: %{name}-log%{?_isa} = %{version}-%{release} -Requires: %{name}-math%{?_isa} = %{version}-%{release} -Requires: %{name}-nowide%{?_isa} = %{version}-%{release} -Requires: %{name}-program-options%{?_isa} = %{version}-%{release} +Requires: %{name}-filesystem = %{version}-%{release} +Requires: %{name}-graph = %{version}-%{release} +Requires: %{name}-iostreams = %{version}-%{release} +Requires: %{name}-locale = %{version}-%{release} +Requires: %{name}-log = %{version}-%{release} +Requires: %{name}-math = %{version}-%{release} +Requires: %{name}-nowide = %{version}-%{release} +Requires: %{name}-program-options = %{version}-%{release} %if %{with python3} -Requires: %{name}-python3%{?_isa} = %{version}-%{release} +Requires: %{name}-python3 = %{version}-%{release} %endif -Requires: %{name}-random%{?_isa} = %{version}-%{release} -Requires: %{name}-regex%{?_isa} = %{version}-%{release} -Requires: %{name}-serialization%{?_isa} = %{version}-%{release} -Requires: %{name}-stacktrace%{?_isa} = %{version}-%{release} -Requires: %{name}-system%{?_isa} = %{version}-%{release} -Requires: %{name}-test%{?_isa} = %{version}-%{release} -Requires: %{name}-thread%{?_isa} = %{version}-%{release} -Requires: %{name}-timer%{?_isa} = %{version}-%{release} -Requires: %{name}-type_erasure%{?_isa} = %{version}-%{release} -Requires: %{name}-wave%{?_isa} = %{version}-%{release} +Requires: %{name}-random = %{version}-%{release} +Requires: %{name}-regex = %{version}-%{release} +Requires: %{name}-serialization = %{version}-%{release} +Requires: %{name}-stacktrace = %{version}-%{release} +Requires: %{name}-system = %{version}-%{release} +Requires: %{name}-test = %{version}-%{release} +Requires: %{name}-thread = %{version}-%{release} +Requires: %{name}-timer = %{version}-%{release} +Requires: %{name}-type_erasure = %{version}-%{release} +Requires: %{name}-wave = %{version}-%{release} %if %{with python3} Recommends: (boost-numpy3 if python3-numpy) @@ -140,7 +140,7 @@ variables. %package chrono Summary: Run-time component of boost chrono library -Requires: %{name}-system%{?_isa} = %{version}-%{release} +Requires: %{name}-system = %{version}-%{release} %description chrono @@ -207,7 +207,7 @@ micro-/userland-threads (fibers) scheduled cooperatively. %package filesystem Summary: Run-time component of boost filesystem library -Requires: %{name}-system%{?_isa} = %{version}-%{release} +Requires: %{name}-system = %{version}-%{release} %description filesystem @@ -217,7 +217,7 @@ directories. %package graph Summary: Run-time component of boost graph library -Requires: %{name}-regex%{?_isa} = %{version}-%{release} +Requires: %{name}-regex = %{version}-%{release} %description graph @@ -244,9 +244,9 @@ simply "JSON" %package locale Summary: Run-time component of boost locale library -Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Requires: %{name}-system%{?_isa} = %{version}-%{release} -Requires: %{name}-thread%{?_isa} = %{version}-%{release} +Requires: %{name}-chrono = %{version}-%{release} +Requires: %{name}-system = %{version}-%{release} +Requires: %{name}-thread = %{version}-%{release} %description locale @@ -282,7 +282,7 @@ Run-time support for Boost.Nowide. %package numpy3 Summary: Run-time component of boost numpy library for Python 3 -Requires: %{name}-python3%{?_isa} = %{version}-%{release} +Requires: %{name}-python3 = %{version}-%{release} Requires: python3-numpy %description numpy3 @@ -364,7 +364,7 @@ program execution monitoring. %package thread Summary: Run-time component of boost thread library -Requires: %{name}-system%{?_isa} = %{version}-%{release} +Requires: %{name}-system = %{version}-%{release} %description thread @@ -375,8 +375,8 @@ data specific to individual threads. %package timer Summary: Run-time component of boost timer library -Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Requires: %{name}-system%{?_isa} = %{version}-%{release} +Requires: %{name}-chrono = %{version}-%{release} +Requires: %{name}-system = %{version}-%{release} %description timer @@ -386,8 +386,8 @@ with as little as one #include and one additional line of code. %package type_erasure Summary: Run-time component of boost type erasure library -Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Requires: %{name}-system%{?_isa} = %{version}-%{release} +Requires: %{name}-chrono = %{version}-%{release} +Requires: %{name}-system = %{version}-%{release} %description type_erasure @@ -396,11 +396,11 @@ that is more flexible than that provided by the core language. %package wave Summary: Run-time component of boost C99/C++ preprocessing library -Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Requires: %{name}-date-time%{?_isa} = %{version}-%{release} -Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} -Requires: %{name}-system%{?_isa} = %{version}-%{release} -Requires: %{name}-thread%{?_isa} = %{version}-%{release} +Requires: %{name}-chrono = %{version}-%{release} +Requires: %{name}-date-time = %{version}-%{release} +Requires: %{name}-filesystem = %{version}-%{release} +Requires: %{name}-system = %{version}-%{release} +Requires: %{name}-thread = %{version}-%{release} %description wave @@ -410,28 +410,26 @@ preprocessor functionality. %package devel Summary: The Boost C++ headers and shared development libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libicu-devel%{?_isa} +Requires: %{name} = %{version}-%{release} +Requires: libicu-devel %if %{with quadmath} -Requires: libquadmath-devel%{?_isa} +Requires: libquadmath-devel %endif %if %{with python3} # Require boost-numpy3 here, because main boost metapackage only Recommends: it -Requires: %{name}-numpy3%{?_isa} = %{version}-%{release} +Requires: %{name}-numpy3 = %{version}-%{release} Obsoletes: %{name}-python3-devel < 1.69.0 Provides: %{name}-python3-devel = %{version}-%{release} -Provides: %{name}-python3-devel%{?_isa} = %{version}-%{release} %endif Obsoletes: boost-nowide-devel <= 0.20190814 Provides: boost-nowide-devel = %{version} -Provides: boost-nowide-devel%{?_isa} = %{version} %description devel Headers and shared object symbolic links for the Boost C++ libraries. %package static Summary: The Boost C++ static development libraries -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} %description static Static Boost C++ libraries. @@ -457,7 +455,7 @@ This package contains example source files distributed with boost. %package openmpi Summary: Run-time component of Boost.MPI library BuildRequires: openmpi-devel -Requires: %{name}-serialization%{?_isa} = %{version}-%{release} +Requires: %{name}-serialization = %{version}-%{release} %description openmpi @@ -466,9 +464,9 @@ API over the OpenMPI implementation of MPI. %package openmpi-devel Summary: Shared library symbolic links for Boost.MPI -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} -Requires: %{name}-graph-openmpi%{?_isa} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-openmpi = %{version}-%{release} +Requires: %{name}-graph-openmpi = %{version}-%{release} %description openmpi-devel @@ -479,10 +477,10 @@ API over the OpenMPI implementation of MPI. %package openmpi-python3 Summary: Python 3 run-time component of Boost.MPI library -Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} -Requires: %{name}-python3%{?_isa} = %{version}-%{release} -Requires: %{name}-serialization%{?_isa} = %{version}-%{release} -Requires: python3-openmpi%{?_isa} +Requires: %{name}-openmpi = %{version}-%{release} +Requires: %{name}-python3 = %{version}-%{release} +Requires: %{name}-serialization = %{version}-%{release} +Requires: python3-openmpi %description openmpi-python3 @@ -491,9 +489,9 @@ API over the OpenMPI implementation of MPI. %package openmpi-python3-devel Summary: Shared library symbolic links for Boost.MPI Python 3 component -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-openmpi-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-openmpi-python3%{?_isa} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-openmpi-devel = %{version}-%{release} +Requires: %{name}-openmpi-python3 = %{version}-%{release} %description openmpi-python3-devel @@ -504,8 +502,8 @@ providing a clean C++ API over the OpenMPI implementation of MPI. %package graph-openmpi Summary: Run-time component of parallel boost graph library -Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} -Requires: %{name}-serialization%{?_isa} = %{version}-%{release} +Requires: %{name}-openmpi = %{version}-%{release} +Requires: %{name}-serialization = %{version}-%{release} %description graph-openmpi @@ -522,7 +520,7 @@ back-end to do the parallel work. %package mpich Summary: Run-time component of Boost.MPI library BuildRequires: mpich-devel -Requires: %{name}-serialization%{?_isa} = %{version}-%{release} +Requires: %{name}-serialization = %{version}-%{release} %description mpich @@ -544,10 +542,10 @@ API over the MPICH implementation of MPI. %package mpich-python3 Summary: Python 3 run-time component of Boost.MPI library -Requires: %{name}-mpich%{?_isa} = %{version}-%{release} -Requires: %{name}-python3%{?_isa} = %{version}-%{release} -Requires: %{name}-serialization%{?_isa} = %{version}-%{release} -Requires: python3-mpich%{?_isa} +Requires: %{name}-mpich = %{version}-%{release} +Requires: %{name}-python3 = %{version}-%{release} +Requires: %{name}-serialization = %{version}-%{release} +Requires: python3-mpich %description mpich-python3 @@ -556,9 +554,9 @@ API over the MPICH implementation of MPI. %package mpich-python3-devel Summary: Shared library symbolic links for Boost.MPI Python 3 component -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-mpich-python3%{?_isa} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-mpich-devel = %{version}-%{release} +Requires: %{name}-mpich-python3 = %{version}-%{release} %description mpich-python3-devel @@ -569,8 +567,8 @@ providing a clean C++ API over the MPICH implementation of MPI. %package graph-mpich Summary: Run-time component of parallel boost graph library -Requires: %{name}-mpich%{?_isa} = %{version}-%{release} -Requires: %{name}-serialization%{?_isa} = %{version}-%{release} +Requires: %{name}-mpich = %{version}-%{release} +Requires: %{name}-serialization = %{version}-%{release} %description graph-mpich @@ -905,6 +903,8 @@ rm -f tmp-doc-files-to-be-installed rm -f tmp-doc-directories %{__install} -p -m 644 -t $EXAMPLESPATH LICENSE_1_0.txt +%generate_compatibility_deps + %post doctools CATALOG=%{_sysconfdir}/xml/catalog @@ -933,66 +933,80 @@ fi %files +%dir %{abidir} %license LICENSE_1_0.txt %files atomic %license LICENSE_1_0.txt %{_libdir}/libboost_atomic.so.%{sonamever} +%{abidir}/libboost_atomic.dump %files chrono %license LICENSE_1_0.txt %{_libdir}/libboost_chrono.so.%{sonamever} +%{abidir}/libboost_chrono.dump %files container %license LICENSE_1_0.txt %{_libdir}/libboost_container.so.%{sonamever} +%{abidir}/libboost_container.dump %if %{with context} %files context %license LICENSE_1_0.txt %{_libdir}/libboost_context.so.%{sonamever} +%{abidir}/libboost_context.dump %files coroutine %license LICENSE_1_0.txt %{_libdir}/libboost_coroutine.so.%{sonamever} - +%{abidir}/libboost_coroutine.dump %endif %files date-time %license LICENSE_1_0.txt %{_libdir}/libboost_date_time.so.%{sonamever} +%{abidir}/libboost_date_time.dump %if %{with context} %files fiber %license LICENSE_1_0.txt %{_libdir}/libboost_fiber.so.%{sonamever} +%{abidir}/libboost_fiber.dump %endif %files filesystem %license LICENSE_1_0.txt %{_libdir}/libboost_filesystem.so.%{sonamever} +%{abidir}/libboost_filesystem.dump %files graph %license LICENSE_1_0.txt %{_libdir}/libboost_graph.so.%{sonamever} +%{abidir}/libboost_graph.dump %files iostreams %license LICENSE_1_0.txt %{_libdir}/libboost_iostreams.so.%{sonamever} +%{abidir}/libboost_iostreams.dump %files json %license LICENSE_1_0.txt %{_libdir}/libboost_json.so.%{sonamever} +%{abidir}/libboost_json.dump %files locale %license LICENSE_1_0.txt %{_libdir}/libboost_locale.so.%{sonamever} +%{abidir}/libboost_locale.dump %files log %license LICENSE_1_0.txt %{_libdir}/libboost_log.so.%{sonamever} %{_libdir}/libboost_log_setup.so.%{sonamever} +%{abidir}/libboost_log.dump +%{abidir}/libboost_log_setup.dump %files math %license LICENSE_1_0.txt @@ -1002,74 +1016,95 @@ fi %{_libdir}/libboost_math_tr1.so.%{sonamever} %{_libdir}/libboost_math_tr1f.so.%{sonamever} %{_libdir}/libboost_math_tr1l.so.%{sonamever} +%{abidir}/libboost_math_c99*.dump +%{abidir}/libboost_math_tr1*.dump %files nowide %license LICENSE_1_0.txt %{_libdir}/libboost_nowide.so.%{sonamever} +%{abidir}/libboost_nowide.dump %if %{with python3} %files numpy3 %license LICENSE_1_0.txt %{_libdir}/libboost_numpy%{python3_version_nodots}.so.%{sonamever} +%{abidir}/libboost_numpy%{python3_version_nodots}.dump %endif %files test %license LICENSE_1_0.txt %{_libdir}/libboost_prg_exec_monitor.so.%{sonamever} %{_libdir}/libboost_unit_test_framework.so.%{sonamever} +%{abidir}/libboost_prg_exec_monitor.dump +%{abidir}/libboost_unit_test_framework.dump %files program-options %license LICENSE_1_0.txt %{_libdir}/libboost_program_options.so.%{sonamever} +%{abidir}/libboost_program_options.dump %if %{with python3} %files python3 %license LICENSE_1_0.txt %{_libdir}/libboost_python%{python3_version_nodots}.so.%{sonamever} +%{abidir}/libboost_python%{python3_version_nodots}.dump %endif %files random %license LICENSE_1_0.txt %{_libdir}/libboost_random.so.%{sonamever} +%{abidir}/libboost_random.dump %files regex %license LICENSE_1_0.txt %{_libdir}/libboost_regex.so.%{sonamever} +%{abidir}/libboost_regex.dump %files serialization %license LICENSE_1_0.txt %{_libdir}/libboost_serialization.so.%{sonamever} %{_libdir}/libboost_wserialization.so.%{sonamever} +%{abidir}/libboost_serialization.dump +%{abidir}/libboost_wserialization.dump %files stacktrace %license LICENSE_1_0.txt %{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever} %{_libdir}/libboost_stacktrace_basic.so.%{sonamever} %{_libdir}/libboost_stacktrace_noop.so.%{sonamever} +%{abidir}/libboost_stacktrace_addr2line.dump +%{abidir}/libboost_stacktrace_basic.dump +%{abidir}/libboost_stacktrace_noop.dump %files system %license LICENSE_1_0.txt %{_libdir}/libboost_system.so.%{sonamever} +%{abidir}/libboost_system.dump %files thread %license LICENSE_1_0.txt %{_libdir}/libboost_thread.so.%{sonamever} +%{abidir}/libboost_thread.dump %files timer %license LICENSE_1_0.txt %{_libdir}/libboost_timer.so.%{sonamever} +%{abidir}/libboost_timer.dump %files type_erasure %license LICENSE_1_0.txt %{_libdir}/libboost_type_erasure.so.%{sonamever} +%{abidir}/libboost_type_erasure.dump %files wave %license LICENSE_1_0.txt %{_libdir}/libboost_wave.so.%{sonamever} +%{abidir}/libboost_wave.dump %files contract %license LICENSE_1_0.txt %{_libdir}/libboost_contract.so.%{sonamever} +%{abidir}/libboost_contract.dump %files doc %doc %{boost_docdir}/* @@ -1137,6 +1172,7 @@ fi %if %{with openmpi} %{_libdir}/openmpi/lib/*.a %endif +%{abidir}/mpi.dump # OpenMPI packages %if %{with openmpi} @@ -1144,17 +1180,20 @@ fi %files openmpi %license LICENSE_1_0.txt %{_libdir}/openmpi/lib/libboost_mpi.so.%{sonamever} +%{abidir}/libboost_mpi.dump %files openmpi-devel %license LICENSE_1_0.txt %{_libdir}/openmpi/lib/libboost_mpi.so %{_libdir}/openmpi/lib/libboost_graph_parallel.so +%{abidir}/libboost_graph_parallel.dump %if %{with python3} %files openmpi-python3 %license LICENSE_1_0.txt %{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so.%{sonamever} +%{abidir}/libboost_mpi_python%{python3_version_nodots}.dump %{python3_sitearch}/openmpi/boost/ %files openmpi-python3-devel @@ -1207,13 +1246,18 @@ fi %files doctools %license LICENSE_1_0.txt %{_bindir}/quickbook +%{abidir}/quickbook-option.list %{_datadir}/boostbook/ %files b2 %license LICENSE_1_0.txt %{_bindir}/b2 +%{abidir}/b2-option.list %{_mandir}/man1/b2.1* %changelog -* Thu Apr 14 2022 Zhongling He 1.78.0-1 +* Tue Nov 01 2022 mgb01105731 - 1.78.0-2 +- optimise spec file + +* Thu Apr 14 2022 Zhongling He - 1.78.0-1 - Init package from upstream v1.78.0 -- Gitee