From fc156f246f6c065aa7760f3ee11d99ed93f21911 Mon Sep 17 00:00:00 2001 From: lingsheng Date: Wed, 2 Dec 2020 15:43:42 +0800 Subject: [PATCH] Resolve conflicts in upgrading --- scons.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scons.spec b/scons.spec index f0968ba..492b09f 100644 --- a/scons.spec +++ b/scons.spec @@ -1,6 +1,6 @@ Name: scons Version: 3.1.1 -Release: 3 +Release: 4 Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org @@ -25,8 +25,9 @@ Scons HTML documentation. %package -n python2-%{name} Summary: An Open Source software construction tool BuildRequires: python2-devel +Requires: %{name}-help = %{version}-%{release} %{?python_provide:%python_provide python2-%{name}} -Provides: scons-python2 = 0:%{version}-%{release} +Provides: scons-python2 = 0:%{version}-%{release} %description -n python2-%{name} SCons is an Open Source software construction tool—that is, a next-generation @@ -39,6 +40,7 @@ and faster way to build software. Summary: An Open Source software construction tool BuildRequires: python3-devel +Requires: %{name}-help = %{version}-%{release} Provides: scons = 0:%{version}-%{release} Provides: scons-python3 Obsoletes: scons < 0:5.0.3-3 @@ -142,7 +144,6 @@ popd %{_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 @@ -153,13 +154,16 @@ popd %{_bindir}/%{name}*-%{python3_version} %{python3_sitelib}/SCons/ %{python3_sitelib}/scons-%{version}*.egg-info -%{_mandir}/man?/* %files help %doc HTML %license %{name}-%{version}/src/LICENSE.txt +%{_mandir}/man?/* %changelog +* Wed Dec 02 2020 lingsheng - 3.1.1-4 +- Resolve conflicts in upgrading + * Mon Nov 30 2020 huanghaitao - 3.1.1-3 - Fix help package rollback error