Release 4.2.0

This commit is contained in:
Antonio Trande 2021-08-09 12:27:21 +02:00
parent 366bea0167
commit 13ec13677f
3 changed files with 28 additions and 15 deletions

2
.gitignore vendored
View File

@ -28,3 +28,5 @@
/scons-doc-4.0.1.tar.gz
/scons-4.1.0.tar.gz
/scons-doc-4.1.0.tar.gz
/scons-4.2.0.tar.gz
/scons-doc-4.2.0.tar.gz

View File

@ -15,14 +15,14 @@
%endif
# Install prebuilt documentation
%bcond_without prebuilt_doc
%bcond_with prebuilt_doc
# Additional EPEL builds
%bcond_with python3_other
Name: scons
Version: 4.1.0
Release: 5%{?dist}
Version: 4.2.0
Release: 1%{?dist}
Summary: An Open Source software construction tool
License: MIT
URL: http://www.scons.org
@ -53,7 +53,7 @@ BuildArch: noarch
%if 0%{without prebuilt_doc}
BuildRequires: python3-sphinx
BuildRequires: python3-sphinx_rtd_theme
BuildRequires: rst2pdf, fop
BuildRequires: rst2pdf, fop, ghostscript
BuildRequires: python3dist(readme-renderer)
%endif
%description doc
@ -151,6 +151,10 @@ pathfix.py -i %{__python3} -pn %{name}-%{version}/scripts/scons.py
pathfix3.8.py -i %{__python3} -pn %{name}-%{version}/scripts/scons.py
%endif
# PREVENT MANPAGES REMOVING
# See https://github.com/SCons/scons/issues/3989#issuecomment-890582380
sed -i -e 's!env.AddPostAction(tgz_file, Delete(man_pages))! !g' %{name}-%{version}/SConstruct
%if %{with python3_other}
cp -a %{name}-%{version} %{name}-%{version}-py%{python3_other_pkgversion}
pathfix.py -i %{__python3_other} -pn %{name}-%{version}-py%{python3_other_pkgversion}/scripts/scons.py
@ -158,19 +162,25 @@ pathfix.py -i %{__python3_other} -pn %{name}-%{version}-py%{python3_other_pkgver
%build
%if 0%{?el7} || 0%{?fedora} || 0%{?eln}
%{__python3} scripts/scons.py --include-dir= -j1 \
%{__python3} scripts/scons.py \
%else
%{_bindir}/python3.8 scripts/scons.py --include-dir= -j1 \
%{_bindir}/python3.8 scripts/scons.py \
%endif
%if %{with debug}
--debug=explain
--debug=explain \
%endif
%if %{without doc}
SKIP_DOC=True
%endif
%if %{with python3_other}
pushd %{name}-%{version}-py%{python3_other_pkgversion}
%{__python3_other} scripts/scons.py --include-dir= -j1 \
%{__python3_other} scripts/scons.py \
%if %{with debug}
--debug=explain
--debug=explain \
%endif
%if %{without doc}
SKIP_DOC=True
%endif
popd
@ -180,9 +190,7 @@ popd
export LDFLAGS="%{build_ldflags}"
export CFLAGS="%{build_cflags}"
%if 0%{?el7} || 0%{?fedora} || 0%{?eln}
%{__python3} setup.py install -O1 --skip-build --root %{buildroot} \
--install-scripts=%{_bindir} \
--install-data=%{_datadir}
%py3_install -- --install-scripts=%{_bindir} --install-data=%{_datadir}
pushd %{buildroot}%{_bindir}
for i in %{name}-3 %{name}-v%{version}-%{python3_version} %{name}-%{python3_version}; do
@ -198,7 +206,7 @@ popd
%else
%{_bindir}/python3.8 setup.py install -O1 --skip-build --root %{buildroot} \
%{_bindir}/python3.8 setup.py install -O1 --skip-build --root %{buildroot} \
--install-scripts=%{_bindir} \
--install-data=%{_datadir}
@ -292,6 +300,9 @@ popd
%endif
%changelog
* Sun Aug 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 4.2.0-1
- Release 4.2.0
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (scons-4.1.0.tar.gz) = f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
SHA512 (scons-doc-4.1.0.tar.gz) = 17fb391e7ac003869b17ee4307fa0633efc736825f162acdac0d9c272a7ef8dcbc70b064b29baf9cbb6afc7e8d96b3e4fffa909ec3c2fb65252d43d2b6136248
SHA512 (scons-4.2.0.tar.gz) = 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97
SHA512 (scons-doc-4.2.0.tar.gz) = 72126a3fb69e069791237dd32bb490aef1cc3ae3e67d412602d210373e409e9478d7346d1511a57e8f4226049634545aa318b0039d0169e737ef6db3d48ed4ab