a3e712
Fix arch-dependent requires in subpackages (RHBZ #1398591)
@@ -29,7 +29,7 @@
|
|
29
29
|
Summary: The RPM package management system
|
30
30
|
Name: rpm
|
31
31
|
Version: %{rpmver}
|
32
|
-
Release: %{?snapver:0.%{snapver}.}
|
32
|
+
Release: %{?snapver:0.%{snapver}.}5%{?dist}
|
33
33
|
Group: System Environment/Base
|
34
34
|
Url: http://www.rpm.org/
|
35
35
|
Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
|
@@ -173,7 +173,7 @@ packages.
|
|
173
173
|
Summary: Development files for manipulating RPM packages
|
174
174
|
Group: Development/Libraries
|
175
175
|
License: GPLv2+ and LGPLv2+ with exceptions
|
176
|
-
Requires: %{name
|
176
|
+
Requires: %{name} = %{version}-%{release}
|
177
177
|
Requires: %{name}-libs%{_isa} = %{version}-%{release}
|
178
178
|
Requires: %{name}-build-libs%{_isa} = %{version}-%{release}
|
179
179
|
Requires: popt-devel%{_isa}
|
@@ -221,7 +221,7 @@ Summary: Python 2 bindings for apps which will manipulate RPM packages
|
|
221
221
|
Group: Development/Libraries
|
222
222
|
BuildRequires: python2-devel
|
223
223
|
%{?python_provide:%python_provide python2-%{name}}
|
224
|
-
Requires: %{name
|
224
|
+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
225
225
|
Provides: %{name}-python = %{version}-%{release}
|
226
226
|
Obsoletes: %{name}-python < %{version}-%{release}
|
227
227
|
|
@@ -239,7 +239,7 @@ Group: Development/Libraries
|
|
239
239
|
BuildRequires: python3-devel
|
240
240
|
%{?python_provide:%python_provide python3-%{name}}
|
241
241
|
%{?system_python_abi}
|
242
|
-
Requires: %{name
|
242
|
+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
243
243
|
Provides: %{name}-python3 = %{version}-%{release}
|
244
244
|
Obsoletes: %{name}-python3 < %{version}-%{release}
|
245
245
|
|
@@ -558,6 +558,9 @@ exit 0
|
|
558
558
|
%doc doc/librpm/html/*
|
559
559
|
|
560
560
|
%changelog
|
561
|
+
* Fri Nov 25 2016 Igor Gnatenko <ignatenko@redhat.com> - 4.13.0-5
|
562
|
+
- Fix arch-dependent requires in subpackages (RHBZ #1398591)
|
563
|
+
|
561
564
|
* Fri Nov 11 2016 Panu Matilainen <pmatilai@redhat.com> - 4.13.0-4
|
562
565
|
- Expand python subpackage obsoletion range (related: #1394125)
|
563
566
|
|