diff --git a/python-scons.spec b/python-scons.spec index 2e13bd0785fc1a0f121a7352490bbaf4e1247112..37ba354558e1b28c127e2dab0d8faab1ed177cbb 100644 --- a/python-scons.spec +++ b/python-scons.spec @@ -1,5 +1,5 @@ Name: scons -Version: 4.5.2 +Version: 4.8.1 Release: 1 Summary: An Open Source software construction tool License: MIT @@ -8,6 +8,7 @@ Source0: https://github.com/SCons/scons/archive/%{version}/scons-%{version Source1: https://scons.org/doc/%{version}/scons-doc-%{version}.tar.gz BuildArch: noarch BuildRequires: make +BuildRequires: python3-pip python3-hatchling python3-hatch-vcs %description SCons is an Open Source software construction tool—that is, a next-generation @@ -46,52 +47,12 @@ and faster way to build software. %prep %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 - iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ - touch -r $file $file.new && \ - mv $file.new $file -done - -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 -%{__python3} scripts/scons.py +%pyproject_build %install -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 -for i in %{name}ign-3 %{name}ign-v%{version}-%{python3_version} %{name}ign-%{python3_version}; do - ln -fs %{_bindir}/%{name}ign %{buildroot}%{_bindir}/$i -done -for i in %{name}-time-3 %{name}-time-v%{version}-%{python3_version} %{name}-time-%{python3_version}; do - ln -fs %{_bindir}/%{name}-time %{buildroot}%{_bindir}/$i -done -for i in %{name}-configure-cache-3 %{name}-configure-cache-v%{version}-%{python3_version} %{name}-configure-cache-%{python3_version}; do - ln -fs %{_bindir}/%{name}-configure-cache %{buildroot}%{_bindir}/$i -done -popd +%pyproject_install %check %{__python3} runtest.py -P %{__python3} --passed --quit-on-failure SCons/BuilderTests.py @@ -99,18 +60,23 @@ popd %files -n python3-%{name} %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}/*.egg-info -%{_mandir}/man1/* +%{python3_sitelib}/SCons* %files doc %doc HTML PDF EPUB TEXT %changelog +* Wed Nov 27 2024 xu_ping <707078654@qq.com> - 4.8.1-1 +- Upgrade to version 4.8.1 + * Added more type annotations to internal routines. + * Changed the message about scons -H to clarify it shows built-in options only. + * Add JDK 21 LTS support + * Fixed the Scanner examples in the User Guide to be runnable and added +some more explanation. + * Add locking around creation of CacheDir config file. + * Fri Dec 29 2023 liyanan - 4.5.2-1 - Upgrade to version 4.5.2 diff --git a/scons-4.5.2.tar.gz b/scons-4.8.1.tar.gz similarity index 43% rename from scons-4.5.2.tar.gz rename to scons-4.8.1.tar.gz index 3558559835d8f28ff0684471f9cb27c478e8667c..92896d470755b5041a5c18de8aecef9ddeeb3a10 100644 Binary files a/scons-4.5.2.tar.gz and b/scons-4.8.1.tar.gz differ diff --git a/scons-doc-4.5.2.tar.gz b/scons-doc-4.8.1.tar.gz similarity index 55% rename from scons-doc-4.5.2.tar.gz rename to scons-doc-4.8.1.tar.gz index 56ae58c9e1ef5a88e4a2d1dd6a7febfd65a4c93e..b20e14eb86f431b441c7c400c9e781ba5c40bbb1 100644 Binary files a/scons-doc-4.5.2.tar.gz and b/scons-doc-4.8.1.tar.gz differ