diff --git a/python-scons.spec b/python-scons.spec index 6f54f5aaf7585c55a9db5f9f09445e053cf6c900..29cf07fac2966beef90f242f64b70e0f95dd35fd 100644 --- a/python-scons.spec +++ b/python-scons.spec @@ -1,12 +1,13 @@ Name: scons -Version: 3.1.1 -Release: 4 +Version: 4.3.0 +Release: 1 Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org Source0: https://github.com/SCons/scons/archive/scons-%{version}.tar.gz Source1: https://scons.org/doc/%{version}/scons-doc-%{version}.tar.gz BuildArch: noarch +BuildRequires: make %description SCons is an Open Source software construction tool—that is, a next-generation @@ -26,6 +27,10 @@ Scons HTML documentation. Summary: An Open Source software construction tool BuildRequires: python3-devel +BuildRequires: python3-lxml +BuildRequires: python3-wheel +BuildRequires: python3-setuptools +BuildRequires: lynx Provides: scons = 0:%{version}-%{release} Provides: scons-python3 Obsoletes: scons < 0:5.0.3-3 @@ -39,10 +44,9 @@ and compiler caches such as ccache. In short, SCons is an easier, more reliable and faster way to build software. %prep -%autosetup -c -a 1 -p1 - -# Remove unused doc directories -rm -rf PDF PS EPUB TEXT +%autosetup -n %{name}-%{version} -N +%setup -n %{name}-%{version} -q -T -D -a 1 +cd .. # Convert to UTF-8 for file in %{name}-%{version}/src/*.txt; do @@ -51,22 +55,30 @@ for file in %{name}-%{version}/src/*.txt; do mv $file.new $file done -cp -a %{name}-%{version} %{name}-%{version}-py3 -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 +sed -i -e 's!env.AddPostAction(tgz_file, Delete(man_pages))! !g' %{name}-%{version}/SConstruct + +pathfix.py -i %{__python3} -pn %{name}-%{version}/scripts/scons.py + +###cp -a %{name}-%{version} %{name}-%{version}-py3 +###sed -i 's|/usr/bin/env python|%{__python3}|' %{name}-%{version}-py3/scripts/scons.py %build -pushd %{name}-%{version}-py3 -%{__python3} bootstrap.py --bootstrap_dir=build/scons -popd +%{__python3} scripts/scons.py %install -pushd %{name}-%{version}-py3/build/scons -%py3_install \ - --standard-lib --no-install-bat --no-version-script \ - --install-scripts=%{_bindir} --install-data=%{_datadir} -popd -pushd %{buildroot}%{_bindir} +export LDFLAGS="%{build_ldflags}" +export CFLAGS="%{build_cflags}" + +%{_bindir}/python3 setup.py install -O1 --skip-build --root %{buildroot} \ + --install-scripts=%{_bindir} \ + --install-data=%{_datadir} + +# Install manpages +mkdir -p %{buildroot}%{_mandir}/man1 +install -pm 644 build/doc/man/*.1 %{buildroot}%{_mandir}/man1/ +rm -f %{buildroot}%{_datadir}/*.1 + +pushd %{buildroot}%{_bindir} for i in %{name}-3 %{name}-v%{version}-%{python3_version} %{name}-%{python3_version}; do ln -fs %{_bindir}/%{name} %{buildroot}%{_bindir}/$i done @@ -82,26 +94,26 @@ done popd %check -pushd %{name}-%{version}-py3 -%{__python3} runtest.py -P %{__python3} --passed --quit-on-failure src/engine/SCons/BuilderTests.py -popd +%{__python3} runtest.py -P %{__python3} --passed --quit-on-failure SCons/BuilderTests.py %files -n python3-%{name} -%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 +%doc CHANGES.txt RELEASE.* +%license LICENSE* %{_bindir}/%{name}*-3 %{_bindir}/%{name} %{_bindir}/%{name}{ign,-time,-configure-cache} %{_bindir}/%{name}*-%{python3_version} %{python3_sitelib}/SCons/ -%{python3_sitelib}/scons-%{version}*.egg-info -%{_mandir}/man?/* +%{python3_sitelib}/*.egg-info +%{_mandir}/man1/* %files doc -%doc HTML -%license %{name}-%{version}/src/LICENSE.txt +%doc HTML PDF EPUB TEXT %changelog +* Fri Jun 10 2022 SimpleUpdate Robot - 4.3.0-1 +- Upgrade to version 4.3.0 + * Wed Dec 23 2020 lingsheng - 3.1.1-4 - Keep spec name same as package diff --git a/scons-3.1.1.tar.gz b/scons-4.3.0.tar.gz similarity index 42% rename from scons-3.1.1.tar.gz rename to scons-4.3.0.tar.gz index 6eb3f0208212ad3b0cd85121063691121062d526..86cf469392088345b289ba8158138284c89bb187 100644 Binary files a/scons-3.1.1.tar.gz and b/scons-4.3.0.tar.gz differ diff --git a/scons-doc-3.1.1.tar.gz b/scons-doc-4.3.0.tar.gz similarity index 53% rename from scons-doc-3.1.1.tar.gz rename to scons-doc-4.3.0.tar.gz index 215264e7062b0dd04a5cb68c5d7a17fd4b6fe092..b827362a02060cb402a6bb203ebdb07902f4cabc 100644 Binary files a/scons-doc-3.1.1.tar.gz and b/scons-doc-4.3.0.tar.gz differ