Release 3.0.4
This commit is contained in:
sagitter
parent
426f365dcc
commit
514cc3e342
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@
|
||||
/scons-2.5.1.tar.gz
|
||||
/scons-3.0.0.tar.gz
|
||||
/scons-3.0.1.tar.gz
|
||||
/scons-3.0.4.tar.gz
|
||||
|
||||
13961
scons-man.html
Normal file
13961
scons-man.html
Normal file
File diff suppressed because it is too large
Load Diff
104
scons.spec
104
scons.spec
@ -22,15 +22,15 @@
|
||||
%global with_python2 1
|
||||
%endif
|
||||
|
||||
Name: scons
|
||||
Version: 3.0.1
|
||||
Release: 12%{?dist}
|
||||
Summary: An Open Source software construction tool
|
||||
|
||||
License: MIT
|
||||
URL: http://www.scons.org
|
||||
Source: http://prdownloads.sourceforge.net/scons/scons-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
Name: scons
|
||||
Version: 3.0.4
|
||||
Release: 1%{?dist}
|
||||
Summary: An Open Source software construction tool
|
||||
License: MIT
|
||||
URL: http://www.scons.org
|
||||
Source0: http://prdownloads.sourceforge.net/scons/scons-%{version}.tar.gz
|
||||
Source1: https://scons.org/doc/production/HTML/scons-man.html
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
SCons is an Open Source software construction tool--that is, a build
|
||||
@ -47,13 +47,20 @@ really changed, not just when the timestamp has been touched. SCons
|
||||
supports side-by-side variant builds, and is easily extended with user-
|
||||
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
|
||||
%description doc
|
||||
Scons HTML documentation.
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%package -n python2-%{name}
|
||||
Summary: An Open Source software construction tool
|
||||
|
||||
BuildRequires: python2-devel
|
||||
Provides: scons = %{version}-%{release}
|
||||
Obsoletes: scons < %{version}-4
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
|
||||
%description -n python2-%{name}
|
||||
@ -124,11 +131,14 @@ defined Builder and/or Scanner objects.
|
||||
%setup -qc
|
||||
|
||||
# Convert to UTF-8
|
||||
for file in %{name}-%{version}/*.txt; do
|
||||
for file in %{name}-%{version}/src/*.txt; do
|
||||
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
|
||||
touch -r $file $file.new && \
|
||||
mv $file.new $file
|
||||
done
|
||||
|
||||
cp -p %{SOURCE1} ./
|
||||
|
||||
%if 0%{?with_python3}
|
||||
cp -a %{name}-%{version} %{name}-%{version}-py3
|
||||
%endif
|
||||
@ -136,39 +146,45 @@ cp -a %{name}-%{version} %{name}-%{version}-py3
|
||||
cp -a %{name}-%{version} %{name}-%{version}-py%{python3_other_pkgversion}
|
||||
%endif
|
||||
%if 0%{?with_python2}
|
||||
sed -i 's|/usr/bin/env python|%{__python2}|' %{name}-%{version}/script/*
|
||||
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/script/*
|
||||
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
|
||||
%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
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if 0%{?with_python2}
|
||||
pushd %{name}-%{version}
|
||||
%py2_build
|
||||
popd
|
||||
%endif
|
||||
%if 0%{?with_python3}
|
||||
pushd %{name}-%{version}-py3
|
||||
%py3_build
|
||||
%{__python3} bootstrap.py --bootstrap_dir=build/scons
|
||||
popd
|
||||
%endif
|
||||
%if 0%{?with_python2}
|
||||
pushd %{name}-%{version}
|
||||
%{__python2} bootstrap.py --bootstrap_dir=build/scons
|
||||
popd
|
||||
%endif
|
||||
%if 0%{?with_python3_other}
|
||||
pushd %{name}-%{version}-py%{python3_other_pkgversion}
|
||||
%py3_other_build
|
||||
%{__python3_other} bootstrap.py --bootstrap_dir=build/scons
|
||||
popd
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
cd %{name}-%{version}-py3
|
||||
pushd %{name}-%{version}-py3/build/scons
|
||||
%py3_install \
|
||||
--standard-lib \
|
||||
--no-install-bat \
|
||||
--no-version-script \
|
||||
--install-scripts=%{_bindir} \
|
||||
--install-data=%{_datadir}
|
||||
cd ..
|
||||
popd
|
||||
|
||||
#Avoiding collisions between the python 2 and python 3 stacks
|
||||
mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-3
|
||||
@ -193,14 +209,14 @@ popd
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
cd %{name}-%{version}-py%{python3_other_pkgversion}
|
||||
pushd %{name}-%{version}-py%{python3_other_pkgversion}/build/scons
|
||||
%py3_other_install \
|
||||
--standard-lib \
|
||||
--no-install-bat \
|
||||
--no-version-script \
|
||||
--install-scripts=%{_bindir} \
|
||||
--install-data=%{_datadir}
|
||||
cd ..
|
||||
popd
|
||||
|
||||
#Avoiding collisions between the python 2 and python 3 stacks
|
||||
mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-3
|
||||
@ -225,14 +241,14 @@ popd
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python2}
|
||||
cd %{name}-%{version}
|
||||
pushd %{name}-%{version}/build/scons
|
||||
%py2_install \
|
||||
--standard-lib \
|
||||
--no-install-bat \
|
||||
--no-version-script \
|
||||
--install-scripts=%{_bindir} \
|
||||
--install-data=%{_datadir}
|
||||
cd ..
|
||||
popd
|
||||
|
||||
#Avoiding collisions between the python 2 and python 3 stacks
|
||||
pushd %{buildroot}%{_bindir}
|
||||
@ -251,10 +267,27 @@ done
|
||||
popd
|
||||
%endif
|
||||
|
||||
%check
|
||||
%if 0%{?with_python3}
|
||||
pushd %{name}-%{version}-py3
|
||||
%{__python3} runtest.py -P %{__python3} --passed --quit-on-failure src/engine/SCons/BuilderTests.py
|
||||
popd
|
||||
%endif
|
||||
%if 0%{?with_python3_other}
|
||||
pushd %{name}-%{version}-py%{python3_other_pkgversion}
|
||||
%{__python3_other} runtest.py -P %{__python3_other} --passed --quit-on-failure src/engine/SCons/BuilderTests.py
|
||||
popd
|
||||
%endif
|
||||
%if 0%{?with_python2}
|
||||
pushd %{name}-%{version}
|
||||
%{__python2} runtest.py -P %{__python2} --passed --quit-on-failure src/engine/SCons/BuilderTests.py
|
||||
popd
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%files -n python2-%{name}
|
||||
%doc %{name}-%{version}/CHANGES.txt %{name}-%{version}/README.txt %{name}-%{version}/RELEASE.txt
|
||||
%license %{name}-%{version}/LICENSE.txt
|
||||
%doc %{name}-%{version}/src/CHANGES.txt %{name}-%{version}/src/README.txt %{name}-%{version}/src/RELEASE.txt
|
||||
%license %{name}-%{version}/src/LICENSE.txt
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/%{name}ign
|
||||
%{_bindir}/%{name}-time
|
||||
@ -267,8 +300,8 @@ popd
|
||||
%endif
|
||||
%if 0%{?with_python3}
|
||||
%files -n python%{python3_pkgversion}-%{name}
|
||||
%doc %{name}-%{version}-py3/CHANGES.txt %{name}-%{version}-py3/README.txt %{name}-%{version}-py3/RELEASE.txt
|
||||
%license %{name}-%{version}-py3/LICENSE.txt
|
||||
%doc %{name}-%{version}-py3/src/CHANGES.txt %{name}-%{version}-py3/src/README.txt %{name}-%{version}-py3/src/RELEASE.txt
|
||||
%license %{name}-%{version}-py3/src/LICENSE.txt
|
||||
%{_bindir}/%{name}*-3
|
||||
%{_bindir}/%{name}*-%{python3_version}
|
||||
%{python3_sitelib}/SCons/
|
||||
@ -278,8 +311,8 @@ popd
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
%files -n python%{python3_other_pkgversion}-%{name}
|
||||
%doc %{name}-%{version}-py%{python3_other_pkgversion}/CHANGES.txt %{name}-%{version}-py%{python3_other_pkgversion}/README.txt %{name}-%{version}-py%{python3_other_pkgversion}/RELEASE.txt
|
||||
%license %{name}-%{version}-py%{python3_other_pkgversion}/LICENSE.txt
|
||||
%doc %{name}-%{version}-py%{python3_other_pkgversion}/src/CHANGES.txt %{name}-%{version}-py%{python3_other_pkgversion}/src/README.txt %{name}-%{version}-py%{python3_other_pkgversion}/src/RELEASE.txt
|
||||
%license %{name}-%{version}-py%{python3_other_pkgversion}/src/LICENSE.txt
|
||||
%{_bindir}/%{name}*-3
|
||||
%{_bindir}/%{name}*-%{python3_other_pkgversion}
|
||||
%{python3_other_sitelib}/SCons/
|
||||
@ -287,7 +320,14 @@ popd
|
||||
%{_mandir}/man?/*
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%doc scons-man.html
|
||||
%license %{name}-%{version}/src/LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Wed Jan 23 2019 Antonio Trande <sagitter at fedoraproject.org> - 3.0.4-1
|
||||
- Release 3.0.4 (bz#1668876)
|
||||
|
||||
* Wed Aug 22 2018 Antonio Trande <sagitter at fedoraproject.org> - 3.0.1-12
|
||||
- Reintroduce python2-scons on fedora 30+
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (scons-3.0.1.tar.gz) = b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
|
||||
SHA512 (scons-3.0.4.tar.gz) = d57924f0e7713ec2e5d7159fbf0078947aa5ce49f7cdf7a4ea47c19efbce7ec335a5e5448e200240be1095655c5c25f1466285f0bed5bdadeb2673845b23c4f5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user