Update to 3.1.2

This commit is contained in:
sagitter 2019-12-17 12:15:40 +01:00
parent 0e7b4dfad4
commit a9fea22d5d
3 changed files with 20 additions and 10 deletions

2
.gitignore vendored
View File

@ -20,3 +20,5 @@
/scons-doc-3.1.0.tar.gz
/scons-3.1.1.tar.gz
/scons-doc-3.1.1.tar.gz
/scons-3.1.2.tar.gz
/scons-doc-3.1.2.tar.gz

View File

@ -21,8 +21,8 @@
%endif
Name: scons
Version: 3.1.1
Release: 4%{?dist}
Version: 3.1.2
Release: 1%{?dist}
Summary: An Open Source software construction tool
License: MIT
URL: http://www.scons.org
@ -47,9 +47,8 @@ defined Builder and/or Scanner objects.
%package doc
Summary: An Open Source software construction tool
# Documentation cannot be built from source yet
#BuildRequires: epydoc, fop, python3-libxml2
BuildArch: noarch
BuildRequires: fop, lynx
%description doc
Scons HTML documentation.
@ -61,9 +60,11 @@ BuildRequires: python2-devel
%{?python_provide:%python_provide python2-%{name}}
%if 0%{?rhel} && 0%{?rhel} == 7
Provides: scons = 0:%{version}-%{release}
BuildRequires: python-lxml
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
Provides: scons-python2 = 0:%{version}-%{release}
BuildRequires: python2-lxml
%endif
%description -n python2-%{name}
@ -87,6 +88,7 @@ defined Builder and/or Scanner objects.
Summary: An Open Source software construction tool
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-lxml
%if 0%{?fedora} || 0%{?rhel} > 7
Provides: scons = 0:%{version}-%{release}
Provides: scons-python3
@ -119,6 +121,7 @@ defined Builder and/or Scanner objects.
Summary: An Open Source software construction tool
BuildRequires: python%{python3_other_pkgversion}-devel
BuildRequires: python%{python3_other_pkgversion}-lxml
Provides: scons-%{__python3_other} = %{version}-%{release}
%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{name}}
@ -162,12 +165,12 @@ sed -i 's|/usr/bin/env python|%{__python2}|' %{name}-%{version}/bootstrap.py
sed -i 's|/usr/bin/env python|%{__python2}|' %{name}-%{version}/src/script/*.py
%endif
%if 0%{?with_python3}
sed -i 's|/usr/bin/env python|%{__python3}|' %{name}-%{version}-py3/bootstrap.py
sed -i 's|/usr/bin/env python|%{__python3}|' %{name}-%{version}-py3/src/script/*.py
pathfix.py -i %{__python3} -pn %{name}-%{version}-py3/bootstrap.py
pathfix.py -i %{__python3} -pn %{name}-%{version}-py3/src/script/*.py
%endif
%if 0%{?with_python3_other}
sed -i 's|/usr/bin/env python|%{__python3_other}|' %{name}-%{version}-py%{python3_other_pkgversion}/bootstrap.py
sed -i 's|/usr/bin/env python|%{__python3_other}|' %{name}-%{version}-py%{python3_other_pkgversion}/src/script/*.py
pathfix.py -i %{__python3_other} -pn %{name}-%{version}-py%{python3_other_pkgversion}/bootstrap.py
pathfix.py -i %{__python3_other} -pn %{name}-%{version}-py%{python3_other_pkgversion}/src/script/*.py
%endif
%build
@ -406,6 +409,11 @@ popd
%license %{name}-%{version}/src/LICENSE.txt
%changelog
* Tue Dec 17 2019 Antonio Trande <sagitter@fedoraproject.org> - 3.1.2-1
- Update to 3.1.2
- Use pathfix.py
- Add python-lxml lynx BR
* Fri Nov 15 2019 Antonio Trande <sagitter@fedoraproject.org> - 3.1.1-4
- Fix Changelog

View File

@ -1,2 +1,2 @@
SHA512 (scons-3.1.1.tar.gz) = 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
SHA512 (scons-doc-3.1.1.tar.gz) = 7dce2a125ccbb8e9f911b2e2955b0f27962ef00787f074e4e0eb2552895d0881e85d2395206677804ee46c007f0509e71c041f27e7b52339e57349d905362728
SHA512 (scons-3.1.2.tar.gz) = b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
SHA512 (scons-doc-3.1.2.tar.gz) = 351112ad21a36ef34558fbf7a59a4368b00d997c465109d6d3955a3e3b9ff9e5251eaaecefb1d82c271b23d150fba58aa769e534d386e58a00f228abdb18c684