diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index d5b8b48..dd7cf08 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -13,4 +13,5 @@ jobs: with: CI_DEPLOY: ${{ secrets.CI_DEPLOY }} PUBLICATOR: ${{ secrets.PUBLICATOR }} + REPO_DEPLOY: ${{ secrets.REPO_DEPLOY }} diff --git a/boost.spec b/boost.spec index a37cdf5..d179297 100644 --- a/boost.spec +++ b/boost.spec @@ -23,6 +23,7 @@ %define libprogramoptions %mklibname boost_program_options_ %{version} %define libpython %mklibname boost_python_ %{version} %define libpython3 %mklibname boost_python35_ %{version} +%define libpython38 %mklibname boost_python38_ %{version} %define librandom %mklibname boost_random_ %{version} %define libregex %mklibname boost_regex_ %{version} %define libserialization %mklibname boost_serialization_ %{version} @@ -39,6 +40,7 @@ %define devname %mklibname boost -d %define sdevname %mklibname boost -d -s %define devpython3 %mklibname boost_python3 -d +%define devpython38 %mklibname boost_python38 -d %ifarch aarch64 %bcond_with context @@ -54,6 +56,8 @@ %define beta %{nil} +%define _libexecdir /usr/libexec + %ifarch %{ix86} %{arm} %bcond_with numpy %else @@ -74,12 +78,13 @@ Summary: Portable C++ libraries Name: boost -Version: 1.74.0 +Version: 1.79.0 Release: 1 License: Boost Group: Development/C++ -URL: http://boost.org -Source0: http://download.sourceforge.net/boost/boost_%{packver}.tar.bz2 +URL: https://www.boost.org +#Source0: http://download.sourceforge.net/boost/boost_%{packver}.tar.bz2 +Source0: https://sourceforge.net/projects/boost/files/boost/%{version}/boost_%{packver}.tar.bz2 Source100: %{name}.rpmlintrc # https://svn.boost.org/trac/boost/ticket/6150 Patch4: boost-1.50.0-fix-non-utf8-files.patch @@ -116,6 +121,7 @@ BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(icu-uc) >= 60.1 BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(python3) +BuildRequires: python38-devel %if %{with numpy} BuildRequires: python3-numpy-devel %endif @@ -567,6 +573,25 @@ running programs dynamically linked against Boost python. %{_libdir}/libboost_numpy35.so.%{version} %endif +%package -n %{libpython38} +Summary: Boost python3 shared library +Group: System/Libraries +# no one should require this, but provided anyway for maximum compatibility: +Provides: boost = %{EVRD} + +%description -n %{libpython38} +Boost is a collection of free peer-reviewed portable C++ source +libraries. The emphasis is on libraries which work well with the C++ +Standard Library. This package contains the shared library needed for +running programs dynamically linked against Boost python. + +%files -n %{libpython38} +%doc LICENSE_1_0.txt +%{_libdir}/libboost_python38.so.%{version} +%ifarch x86_64 +%{_libdir}/libboost_numpy38.so.%{version} +%endif + #---------------------------------------------------------------------------- %package -n %{librandom} @@ -835,6 +860,7 @@ Requires: %{libprogramoptions} = %{EVRD} Requires: %{libpython} = %{EVRD} %endif Requires: %{libpython3} = %{EVRD} +Requires: %{libpython38} = %{EVRD} Requires: %{librandom} = %{EVRD} Requires: %{libregex} = %{EVRD} Requires: %{libserialization} = %{EVRD} @@ -914,6 +940,22 @@ symlinks needed for Boost development. %files -n %{devpython3} %{_libdir}/libboost_python35.so +%package -n %{devpython38} +Summary: The libraries and headers needed for Boost Python 3 development +Group: Development/C++ +Requires: %{libpython38} = %{EVRD} +Requires: %{devname} = %{EVRD} +Provides: %{name}-python38-devel = %{EVRD} + +%description -n %{devpython38} +Boost is a collection of free peer-reviewed portable C++ source +libraries. The emphasis is on libraries which work well with the C++ +Standard Library. This package contains headers and shared library +symlinks needed for Boost development. + +%files -n %{devpython38} +%{_libdir}/libboost_python38.so + #---------------------------------------------------------------------------- %prep @@ -921,16 +963,16 @@ symlinks needed for Boost development. #patch0 -p1 #patch1 -p1 #patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch7 -p1 -%patch10 -p1 -%patch12 -p1 -%patch15 -p1 +#patch4 -p1 +#patch5 -p1 +#patch7 -p1 +#patch10 -p1 +#patch12 -p1 +#patch15 -p1 #patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 +#patch17 -p1 +#patch18 -p1 +#patch19 -p1 # Preparing the docs mkdir packagedoc @@ -948,9 +990,10 @@ cat > ./tools/build/src/user-config.jam << EOF using gcc : %{gcc_ver} : gcc : "%{optflags}" "%{optflags}" "%{ldflags}" ; using python : %{py3_ver} : %{_bindir}/python%{py3_ver} : %{_includedir}/python%{py3_ver}m : %{_libdir} : : : ; using python : %{py_ver} : %{_bindir}/python%{py_ver} : %{_includedir}/python%{py_ver} : %{_libdir} : : : ; +using python : %{py38_ver} : %{_libexecdir}/python%{py38_ver} : %{_includedir}/python%{py38_ver} : %{_libdir} : : : ; EOF -./bootstrap.sh --with-toolset=gcc --with-icu --prefix=%{_prefix} --libdir=%{_libdir} --with-python=%{py3_ver} +./bootstrap.sh --with-toolset=gcc --with-icu --prefix=%{_prefix} --libdir=%{_libdir} --with-python=%{py38_ver} ./b2 -d+2 -q %{?_smp_mflags} --without-mpi \ --prefix=%{_prefix} --libdir=%{_libdir} \ @@ -966,7 +1009,7 @@ EOF linkflags="%{ldflags} -lstdc++ -lm" \ -sHAVE_ICU=1 \ link=shared threading=multi debug-symbols=off --layout=system \ - python=%{py3_ver} + python=%{py38_ver} # Taken from the Fedora .src.rpm. echo ============================= build Boost.Build ==================