From 0ac059baed5894cf7c1d12e40146ab65b836e84d Mon Sep 17 00:00:00 2001 From: zhanghua Date: Thu, 29 Oct 2020 14:45:36 +0800 Subject: [PATCH] remove python2 of package python-scons --- scons.spec | 63 ++++-------------------------------------------------- 1 file changed, 4 insertions(+), 59 deletions(-) diff --git a/scons.spec b/scons.spec index 8dd2228..7cdaf23 100644 --- a/scons.spec +++ b/scons.spec @@ -1,6 +1,6 @@ Name: scons Version: 3.1.1 -Release: 2 +Release: 3 Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org @@ -22,19 +22,6 @@ BuildArch: noarch %description doc Scons HTML documentation. -%package -n python2-%{name} -Summary: An Open Source software construction tool -BuildRequires: python2-devel -%{?python_provide:%python_provide python2-%{name}} -Provides: scons-python2 = 0:%{version}-%{release} - -%description -n python2-%{name} -SCons is an Open Source software construction tool—that is, a next-generation -build tool. Think of SCons as an improved, cross-platform substitute for the -classic Make utility with integrated functionality similar to autoconf/automake -and compiler caches such as ccache. In short, SCons is an easier, more reliable -and faster way to build software. - %package -n python3-%{name} Summary: An Open Source software construction tool @@ -65,8 +52,6 @@ for file in %{name}-%{version}/src/*.txt; do done cp -a %{name}-%{version} %{name}-%{version}-py3 -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 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 @@ -75,37 +60,7 @@ pushd %{name}-%{version}-py3 %{__python3} bootstrap.py --bootstrap_dir=build/scons popd -pushd %{name}-%{version} -%{__python2} bootstrap.py --bootstrap_dir=build/scons -popd - %install -pushd %{name}-%{version}/build/scons -%py2_install \ - --standard-lib --no-install-bat --no-version-script \ - --install-scripts=%{_bindir} --install-data=%{_datadir} -popd - -mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-2 -mv %{buildroot}%{_bindir}/%{name}-configure-cache %{buildroot}%{_bindir}/%{name}-configure-cache-2 -mv %{buildroot}%{_bindir}/%{name}ign %{buildroot}%{_bindir}/%{name}ign-2 -mv %{buildroot}%{_bindir}/%{name}-time %{buildroot}%{_bindir}/%{name}-time-2 - -pushd %{buildroot}%{_bindir} -for i in %{name}-%{python2_version} %{name}-v%{version}-%{python2_version}; do - ln -fs %{_bindir}/%{name}-2 %{buildroot}%{_bindir}/$i -done -for i in %{name}ign-%{python2_version} %{name}ign-v%{version}-%{python2_version}; do - ln -fs %{_bindir}/%{name}ign-2 %{buildroot}%{_bindir}/$i -done -for i in %{name}-time-%{python2_version} %{name}-time-v%{version}-%{python2_version}; do - ln -fs %{_bindir}/%{name}-time-2 %{buildroot}%{_bindir}/$i -done -for i in %{name}-configure-cache-%{python2_version} %{name}-configure-cache-v%{version}-%{python2_version}; do - ln -fs %{_bindir}/%{name}-configure-cache-2 %{buildroot}%{_bindir}/$i -done -popd - pushd %{name}-%{version}-py3/build/scons %py3_install \ --standard-lib --no-install-bat --no-version-script \ @@ -131,19 +86,6 @@ pushd %{name}-%{version}-py3 %{__python3} runtest.py -P %{__python3} --passed --quit-on-failure src/engine/SCons/BuilderTests.py popd -pushd %{name}-%{version} -%{__python2} runtest.py -P %{__python2} --passed --quit-on-failure src/engine/SCons/BuilderTests.py -popd - -%files -n python2-%{name} -%doc %{name}-%{version}/src/CHANGES.txt %{name}-%{version}/src/README.txt %{name}-%{version}/src/RELEASE.txt -%license %{name}-%{version}/src/LICENSE.txt -%{_bindir}/%{name}*-2 -%{_bindir}/%{name}*-%{python2_version} -%{python2_sitelib}/SCons/ -%{python2_sitelib}/scons-%{version}*.egg-info -%{_mandir}/man?/* - %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 @@ -160,6 +102,9 @@ popd %license %{name}-%{version}/src/LICENSE.txt %changelog +* Tue Oct 20 2020 zhanghua - 3.1.1-3 +- remove python2 subpackage + * Thu Jun 4 2020 Captain Wei - 3.1.1-2 - update package version