diff --git a/.gitignore b/.gitignore index 3e87207..1d41d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /scons-4.2.0.tar.gz /scons-doc-4.2.0.tar.gz /scons-4.3.0.tar.gz +/scons-doc-4.3.0.tar.gz diff --git a/scons.spec b/scons.spec index 8d06596..9bbe9ad 100644 --- a/scons.spec +++ b/scons.spec @@ -11,25 +11,30 @@ %bcond_without doc %else %bcond_with doc +%endif + +%if 0%{?el8} %global python3_sitelib %{_prefix}/lib/python3.8/site-packages %endif # Install prebuilt documentation +%if 0%{?el9} +%bcond_without prebuilt_doc +%else %bcond_with prebuilt_doc +%endif # Additional EPEL builds %bcond_with python3_other Name: scons Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org Source0: https://github.com/SCons/scons/archive/%{version}/scons-%{version}.tar.gz -%if 0%{with prebuilt_doc} Source1: https://scons.org/doc/production/scons-doc-%{version}.tar.gz -%endif BuildArch: noarch BuildRequires: make @@ -64,7 +69,7 @@ Scons documentation. %package -n python3-%{name} Summary: An Open Source software construction tool -%if 0%{?el7} || 0%{?fedora} || 0%{?eln} +%if 0%{?el7} || 0%{?el9} || 0%{?fedora} || 0%{?eln} BuildRequires: python3-devel BuildRequires: python3-lxml BuildRequires: python3-wheel @@ -147,7 +152,7 @@ for file in %{name}-%{version}/src/*.txt; do mv $file.new $file done -%if 0%{?el7} || 0%{?fedora} || 0%{?eln} +%if 0%{?el7} || 0%{?el9} || 0%{?fedora} || 0%{?eln} pathfix.py -i %{__python3} -pn %{name}-%{version}/scripts/scons.py %else pathfix3.8.py -i %{__python3} -pn %{name}-%{version}/scripts/scons.py @@ -163,7 +168,7 @@ pathfix.py -i %{__python3_other} -pn %{name}-%{version}-py%{python3_other_pkgver %endif %build -%if 0%{?el7} || 0%{?fedora} || 0%{?eln} +%if 0%{?el7} || 0%{?el9} || 0%{?fedora} || 0%{?eln} %{__python3} scripts/scons.py \ %else %{_bindir}/python3.8 scripts/scons.py \ @@ -191,7 +196,7 @@ popd %install export LDFLAGS="%{build_ldflags}" export CFLAGS="%{build_cflags}" -%if 0%{?el7} || 0%{?fedora} || 0%{?eln} +%if 0%{?el7} || 0%{?el9} || 0%{?fedora} || 0%{?eln} %py3_install -- --install-scripts=%{_bindir} --install-data=%{_datadir} pushd %{buildroot}%{_bindir} @@ -302,6 +307,9 @@ popd %endif %changelog +* Tue Dec 14 2021 Antonio Trande - 4.3.0-2 +- Rebuild on EPEL9 + * Sun Nov 28 2021 Antonio Trande - 4.3.0-1 - Release 4.3.0 diff --git a/sources b/sources index 08802d1..2807ad6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (scons-4.3.0.tar.gz) = 2d91cf3045797c888d24db38d5b44576e56b271a2c4e9d28d7e16026451865f713990ff9e57fa3e0a1c19603c2d6adbbd1ba36d297c9dcce4db4139fcc51cd62 +SHA512 (scons-doc-4.3.0.tar.gz) = b82dc29d4891778a25155db38d09eccc433c146141edc8d7f482bbddd45e5f1b1baf603009b44060797f8530beadcfeb7a251d6bb503e2ffc73595e92e33e405