From d602efb7c878cfd26a5713cab9ef36f3adc47b05 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Mon, 6 Mar 2023 22:54:56 +0100 Subject: [PATCH] Release 4.5.0 --- .gitignore | 2 + scons.spec | 142 ++++++++++------------------------------------------- sources | 4 +- 3 files changed, 30 insertions(+), 118 deletions(-) diff --git a/.gitignore b/.gitignore index 08a3469..8feda46 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ /scons-doc-4.3.0.tar.gz /scons-4.4.0.tar.gz /scons-doc-4.4.0.tar.gz +/scons-4.5.0.tar.gz +/scons-doc-4.5.0.tar.gz diff --git a/scons.spec b/scons.spec index a847752..715237f 100644 --- a/scons.spec +++ b/scons.spec @@ -14,22 +14,15 @@ %endif %if 0%{?el8} -%global python3_sitelib %{_prefix}/lib/python3.8/site-packages +%global python3_sitelib %{_prefix}/lib/python3.9/site-packages %endif # Install prebuilt documentation -%if 0%{?el9} || 0%{?fedora} < 38 %bcond_without prebuilt_doc -%else -%bcond_with prebuilt_doc -%endif - -# Additional EPEL builds -%bcond_with python3_other Name: scons -Version: 4.4.0 -Release: 3%{?dist} +Version: 4.5.0 +Release: 1%{?dist} Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org @@ -78,15 +71,14 @@ BuildRequires: python3-psutil BuildRequires: python3-psutil-tests BuildRequires: lynx %else -BuildRequires: python38-devel -BuildRequires: python38-lxml -BuildRequires: python38-wheel -BuildRequires: python38-setuptools -BuildRequires: python38-psutil -BuildRequires: python38-psutil-tests +BuildRequires: python39-devel +BuildRequires: python39-lxml +BuildRequires: python39-wheel +BuildRequires: python39-setuptools +BuildRequires: python39-psutil BuildRequires: lynx -Provides: scons-python38 = 0:%{version}-%{release} -Provides: python38-scons = 0:%{version}-%{release} +Provides: scons-python39 = 0:%{version}-%{release} +Provides: python39-scons = 0:%{version}-%{release} %endif Provides: scons = 0:%{version}-%{release} Provides: scons-python3 = 0:%{version}-%{release} @@ -96,7 +88,7 @@ Obsoletes: python34-%{name} < 0:%{version}-%{release} Obsoletes: python2-%{name} < 0:%{version}-%{release} Obsoletes: python-%{name} < 0:%{version}-%{release} %endif -%{?python_provide:%python_provide python3-%{name}} +%py_provides python3-%{name} %description -n python3-%{name} SCons is an Open Source software construction tool--that is, a build @@ -113,32 +105,6 @@ 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. -%if %{with python3_other} -%package -n python%{python3_other_pkgversion}-%{name} -Summary: An Open Source software construction tool - -BuildRequires: python%{python3_other_pkgversion}-devel -BuildRequires: python%{python3_other_pkgversion}-lxml -BuildRequires: python%{python3_other_pkgversion}-setuptools -Provides: scons-%{__python3_other} = %{version}-%{release} -%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{name}} - -%description -n python%{python3_other_pkgversion}-%{name} -SCons is an Open Source software construction tool--that is, a build -tool; an improved substitute for the classic Make utility; a better way -to build software. SCons is based on the design which won the Software -Carpentry build tool design competition in August 2000. - -SCons "configuration files" are Python scripts, eliminating the need -to learn a new build tool syntax. SCons maintains a global view of -all dependencies in a tree, and can scan source (or other) files for -implicit dependencies, such as files specified on #include lines. SCons -uses MD5 signatures to rebuild only when the contents of a file have -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. -%endif - %prep %if 0%{with prebuilt_doc} %autosetup -n %{name}-%{version} -N @@ -156,26 +122,24 @@ for file in %{name}-%{version}/src/*.txt; do mv $file.new $file done -%if 0%{?el7} || 0%{?el9} || 0%{?fedora} || 0%{?eln} -%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -i %{__python3} -pn %{name}-%{version}/scripts/scons.py +%if 0%{?fedora} || 0%{?eln} +%py3_shebang_fix %{name}-%{version}/scripts/scons.py %else -pathfix3.8.py -i %{__python3} -pn %{name}-%{version}/scripts/scons.py +pathfix%{python3_version}.py -i %{__python3} -pn %{name}-%{version}/scripts/scons.py +%endif +%if 0%{?el8} +pathfix3.9.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} -%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -i %{__python3_other} -pn %{name}-%{version}-py%{python3_other_pkgversion}/scripts/scons.py -%endif - %build %if 0%{?el7} || 0%{?el9} || 0%{?fedora} || 0%{?eln} %{__python3} scripts/scons.py \ %else -%{_bindir}/python3.8 scripts/scons.py \ +%{_bindir}/python3.9 scripts/scons.py \ %endif %if %{with debug} --debug=explain \ @@ -184,19 +148,6 @@ cp -a %{name}-%{version} %{name}-%{version}-py%{python3_other_pkgversion} SKIP_DOC=True %endif -%if %{with python3_other} -pushd %{name}-%{version}-py%{python3_other_pkgversion} -%{__python3_other} scripts/scons.py \ -%if %{with debug} - --debug=explain \ -%endif -%if %{without doc} - SKIP_DOC=True -%endif - -popd -%endif - %install export LDFLAGS="%{build_ldflags}" export CFLAGS="%{build_cflags}" @@ -217,18 +168,18 @@ popd %else -%{_bindir}/python3.8 setup.py install -O1 --skip-build --root %{buildroot} \ +%{_bindir}/python3.9 setup.py install -O1 --skip-build --root %{buildroot} \ --install-scripts=%{_bindir} \ --install-data=%{_datadir} pushd %{buildroot}%{_bindir} -for i in %{name}-3 %{name}-v%{version}-3.8 %{name}-3.8; do +for i in %{name}-3 %{name}-v%{version}-3.9 %{name}-3.9; do ln -fs %{name} %{buildroot}%{_bindir}/$i done -for i in %{name}ign-3 %{name}ign-v%{version}-3.8 %{name}ign-3.8; do +for i in %{name}ign-3 %{name}ign-v%{version}-3.9 %{name}ign-3.9; do ln -fs %{name}ign %{buildroot}%{_bindir}/$i done -for i in %{name}-configure-cache-3 %{name}-configure-cache-v%{version}-3.8 %{name}-configure-cache-3.8; do +for i in %{name}-configure-cache-3 %{name}-configure-cache-v%{version}-3.9 %{name}-configure-cache-3.9; do ln -fs %{name}-configure-cache %{buildroot}%{_bindir}/$i done popd @@ -241,40 +192,9 @@ mkdir -p %{buildroot}%{_mandir}/man1 install -pm 644 build/doc/man/*.1 %{buildroot}%{_mandir}/man1/ rm -f %{buildroot}%{_datadir}/*.1 - -%if %{with python3_other} -pushd %{name}-%{version}-py%{python3_other_pkgversion}/build/scons -%py3_other_install \ - --install-scripts=%{_bindir} \ - --install-data=%{_datadir} - -# Install manpages -mkdir -p %{buildroot}%{_mandir}/man1 -install -pm 644 ../build/doc/man/*.1 %{buildroot}%{_mandir}/man1/ -popd - -pushd %{buildroot}%{_bindir} -for i in %{name}-v%{version}-%{__python3_other} %{name}-%{__python3_other}; do - ln -fs %{name}-%{__python3_other} %{buildroot}%{_bindir}/$i -done -for i in %{name}ign-v%{version}-%{__python3_other} %{name}ign-%{__python3_other}; do - ln -fs %{name}ign-%{__python3_other} %{buildroot}%{_bindir}/$i -done -for i in %{name}-configure-cache-v%{version}-%{__python3_other} %{name}-configure-cache-%{__python3_other}; do - ln -fs %{name}-configure-cache-%{__python3_other} %{buildroot}%{_bindir}/$i -done -popd -%endif - %check %{__python3} runtest.py -P %{__python3} --passed --quit-on-failure SCons/BuilderTests.py -%if %{with python3_other} -pushd %{name}-%{version}-py%{python3_other_pkgversion} -%{__python3_other} runtest.py -P %{__python3_other} --passed --quit-on-failure SCons/BuilderTests.py -popd -%endif - %files -n python3-%{name} %doc CHANGES.txt RELEASE.* %license LICENSE* @@ -286,20 +206,6 @@ popd %{python3_sitelib}/*.egg-info/ %{_mandir}/man1/* -%if %{with python3_other} -%files -n python%{python3_other_pkgversion}-%{name} -%doc CHANGES.txt RELEASE.* -%license LICENSE* -%{_bindir}/%{name} -%{_bindir}/%{name}ign -%{_bindir}/%{name}-configure-cache -%{_bindir}/%{name}*-%{__python3_other} -%{_bindir}/%{name}*-%{python3_other_pkgversion} -%{python3_other_sitelib}/SCons/ -%{python3_other_sitelib}/scons-%{version}*.egg-info/ -%{_mandir}/man1/* -%endif - %if %{with doc} %files doc %if 0%{without prebuilt_doc} @@ -311,6 +217,10 @@ popd %endif %changelog +* Mon Mar 06 2023 Antonio Trande - 4.5.0-1 +- Release 4.5.0 +- Use Python-3.9 in EPEL8 + * Sat Jan 21 2023 Fedora Release Engineering - 4.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 5dfc8ed..49c3f5c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (scons-4.4.0.tar.gz) = 01fcd40bf818ca22a278973af1cda3024efb74cf877f15d46607fda860448fbd577fc96ba33fef2bed3d145e662a0371f55e8c927e7ac44feea7f3081791ce11 -SHA512 (scons-doc-4.4.0.tar.gz) = bea91bce38bd577d93f99051f74e37875cd8c9f08ece9be44db4fa84a40c422f0b9311f1aa6b58b9cbf6b676734f72ab36be6ce2bce0a802e76e987983a181ae +SHA512 (scons-4.5.0.tar.gz) = c471a9f68f9f48832836f24d5cba3f1c3493cb9bd85e01467ab1c509baf961259e87e1210b2218933e5c71bf85274246b5e98301fc85ea908ff4a10278c9a363 +SHA512 (scons-doc-4.5.0.tar.gz) = 6ca7dac548c97f10b470c87afeaa45751237df4f9749806590ae6c7d1931907b44871ef8804113f6fc8d2f3b5495640fe7e6540b3f95dcd1556d4eb5310622f4