packages/python-scons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 Resolve conflicts in upgrading

Browse Source 
From: @ultra_planet
Reviewed-by: @jackie_wu123,@small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2020-12-02 16:09:29 +08:00 committed by Gitee
commit b8ce71f3c2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scons.spec
View File

@ -1,6 +1,6 @@
Name: scons Name: scons
Version: 3.1.1 Version: 3.1.1
Release: 3 Release: 4
Summary: An Open Source software construction tool Summary: An Open Source software construction tool
License: MIT License: MIT
URL: http://www.scons.org URL: http://www.scons.org
@ -25,6 +25,7 @@ Scons HTML documentation.
%package -n python2-%{name} %package -n python2-%{name}
Summary: An Open Source software construction tool Summary: An Open Source software construction tool
BuildRequires: python2-devel BuildRequires: python2-devel
Requires: %{name}-help = %{version}-%{release}
%{?python_provide:%python_provide python2-%{name}} %{?python_provide:%python_provide python2-%{name}}
Provides: scons-python2 = 0:%{version}-%{release} Provides: scons-python2 = 0:%{version}-%{release}
@ -39,6 +40,7 @@ and faster way to build software.
Summary: An Open Source software construction tool Summary: An Open Source software construction tool
BuildRequires: python3-devel BuildRequires: python3-devel
Requires: %{name}-help = %{version}-%{release}
Provides: scons = 0:%{version}-%{release} Provides: scons = 0:%{version}-%{release}
Provides: scons-python3 Provides: scons-python3
Obsoletes: scons < 0:5.0.3-3 Obsoletes: scons < 0:5.0.3-3
@ -142,7 +144,6 @@ popd
%{_bindir}/%{name}*-%{python2_version} %{_bindir}/%{name}*-%{python2_version}
%{python2_sitelib}/SCons/ %{python2_sitelib}/SCons/
%{python2_sitelib}/scons-%{version}*.egg-info %{python2_sitelib}/scons-%{version}*.egg-info
%{_mandir}/man?/*
%files -n python3-%{name} %files -n python3-%{name}
%doc %{name}-%{version}-py3/src/CHANGES.txt %{name}-%{version}-py3/src/README.txt %{name}-%{version}-py3/src/RELEASE.txt %doc %{name}-%{version}-py3/src/CHANGES.txt %{name}-%{version}-py3/src/README.txt %{name}-%{version}-py3/src/RELEASE.txt
@ -153,13 +154,16 @@ popd
%{_bindir}/%{name}*-%{python3_version} %{_bindir}/%{name}*-%{python3_version}
%{python3_sitelib}/SCons/ %{python3_sitelib}/SCons/
%{python3_sitelib}/scons-%{version}*.egg-info %{python3_sitelib}/scons-%{version}*.egg-info
%{_mandir}/man?/*
%files help %files help
%doc HTML %doc HTML
%license %{name}-%{version}/src/LICENSE.txt %license %{name}-%{version}/src/LICENSE.txt
%{_mandir}/man?/*
%changelog %changelog
* Wed Dec 02 2020 lingsheng <lingsheng@huawei.com> - 3.1.1-4
- Resolve conflicts in upgrading
* Mon Nov 30 2020 huanghaitao <huanghaitao8@huawei.com> - 3.1.1-3 * Mon Nov 30 2020 huanghaitao <huanghaitao8@huawei.com> - 3.1.1-3
- Fix help package rollback error - Fix help package rollback error