!27 fix the conflict file
From: @xinghe_1 Reviewed-by: @wangbin224 Signed-off-by: @wangbin224
This commit is contained in:
commit
24c323dc58
26
boost.spec
26
boost.spec
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
Name: boost
|
Name: boost
|
||||||
Version: 1.75.0
|
Version: 1.75.0
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: The free peer-reviewed portable C++ source libraries
|
Summary: The free peer-reviewed portable C++ source libraries
|
||||||
License: Boost Software license V1.0
|
License: Boost Software license V1.0
|
||||||
URL: http://www.boost.org
|
URL: http://www.boost.org
|
||||||
@ -213,6 +213,15 @@ Summary: Run-time component of boost iostreams library
|
|||||||
Boost.Iostreams provides a framework for defining streams, stream
|
Boost.Iostreams provides a framework for defining streams, stream
|
||||||
buffers and i/o filters.
|
buffers and i/o filters.
|
||||||
|
|
||||||
|
%package json
|
||||||
|
Summary: Run-time component of boost json library
|
||||||
|
|
||||||
|
%description json
|
||||||
|
|
||||||
|
Run-time support for Boost.Json, a portable C++ library which provides
|
||||||
|
containers and algorithms that implement JavaScript Object Notation, or
|
||||||
|
simply "JSON"
|
||||||
|
|
||||||
%package locale
|
%package locale
|
||||||
Summary: Run-time component of boost locale library
|
Summary: Run-time component of boost locale library
|
||||||
Requires: boost-chrono%{?_isa} = %{version}-%{release}
|
Requires: boost-chrono%{?_isa} = %{version}-%{release}
|
||||||
@ -920,6 +929,10 @@ fi
|
|||||||
%{_libdir}/libboost_iostreams.so.%{sonamever}
|
%{_libdir}/libboost_iostreams.so.%{sonamever}
|
||||||
%{_libdir}/libboost_iostreams.so.%{old_so_version}.*
|
%{_libdir}/libboost_iostreams.so.%{old_so_version}.*
|
||||||
|
|
||||||
|
%files json
|
||||||
|
%license LICENSE_1_0.txt
|
||||||
|
%{_libdir}/libboost_json.so.%{sonamever}
|
||||||
|
|
||||||
%files locale
|
%files locale
|
||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
%{_libdir}/libboost_locale.so.%{sonamever}
|
%{_libdir}/libboost_locale.so.%{sonamever}
|
||||||
@ -951,6 +964,7 @@ fi
|
|||||||
%files nowide
|
%files nowide
|
||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
%{_libdir}/libboost_nowide.so.%{sonamever}
|
%{_libdir}/libboost_nowide.so.%{sonamever}
|
||||||
|
%{_libdir}/libboost_nowide.so.%{old_so_version}.*
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
|
|
||||||
@ -997,18 +1011,18 @@ fi
|
|||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
%{_libdir}/libboost_serialization.so.%{sonamever}
|
%{_libdir}/libboost_serialization.so.%{sonamever}
|
||||||
%{_libdir}/libboost_wserialization.so.%{sonamever}
|
%{_libdir}/libboost_wserialization.so.%{sonamever}
|
||||||
|
|
||||||
%{_libdir}/libboost_serialization.so.%{old_so_version}.*
|
%{_libdir}/libboost_serialization.so.%{old_so_version}.*
|
||||||
%{_libdir}/libboost_wserialization.so.%{old_so_version}.*
|
%{_libdir}/libboost_wserialization.so.%{old_so_version}.*
|
||||||
|
|
||||||
%files stacktrace
|
%files stacktrace
|
||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
%{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever}
|
%{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever}
|
||||||
%{_libdir}/libboost_stacktrace_basic.so.%{sonamever}
|
%{_libdir}/libboost_stacktrace_basic.so.%{sonamever}
|
||||||
%{_libdir}/libboost_stacktrace_noop.so.%{sonamever}
|
%{_libdir}/libboost_stacktrace_noop.so.%{sonamever}
|
||||||
|
|
||||||
%{_libdir}/libboost_stacktrace_addr2line.so.%{old_so_version}.*
|
%{_libdir}/libboost_stacktrace_addr2line.so.%{old_so_version}.*
|
||||||
%{_libdir}/libboost_stacktrace_basic.so.%{old_so_version}.*
|
%{_libdir}/libboost_stacktrace_basic.so.%{old_so_version}.*
|
||||||
%{_libdir}/libboost_stacktrace_noop.so.%{old_so_version}.*
|
%{_libdir}/libboost_stacktrace_noop.so.%{old_so_version}.*
|
||||||
|
|
||||||
%files system
|
%files system
|
||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
%{_libdir}/libboost_system.so.%{sonamever}
|
%{_libdir}/libboost_system.so.%{sonamever}
|
||||||
@ -1038,12 +1052,11 @@ fi
|
|||||||
%doc %{boost_docdir}/*
|
%doc %{boost_docdir}/*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%exclude %{_libdir}/libboost_nump%{python3_lib_version}.so
|
%exclude %{_libdir}/libboost_numpy%{python3_lib_version}.so
|
||||||
%exclude %{_libdir}/libboost_python%{python3_lib_version}.so
|
%exclude %{_libdir}/libboost_python%{python3_lib_version}.so
|
||||||
%license LICENSE_1_0.txt
|
%license LICENSE_1_0.txt
|
||||||
%{_includedir}/%{name}
|
%{_includedir}/%{name}
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/*.so.*
|
|
||||||
%{_libdir}/*.a
|
%{_libdir}/*.a
|
||||||
%if 0%{with mpich}
|
%if 0%{with mpich}
|
||||||
%{_libdir}/mpich/lib/*.a
|
%{_libdir}/mpich/lib/*.a
|
||||||
@ -1128,6 +1141,9 @@ fi
|
|||||||
%{_mandir}/man1/bjam.1*
|
%{_mandir}/man1/bjam.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 5 2021 xinghe <xinghe1@huawei.com> - 1.75.0-3
|
||||||
|
- fix the conflict between the devel package file and the other subpackage file
|
||||||
|
|
||||||
* Thu Feb 4 2021 xinghe <xinghe1@huawei.com> - 1.75.0-2
|
* Thu Feb 4 2021 xinghe <xinghe1@huawei.com> - 1.75.0-2
|
||||||
- fix master build
|
- fix master build
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user