From b9ddc1fd31822d0a81544698158eb09b604c847b Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mar 27 2017 09:52:49 +0000
Subject: Fix problems in previous commit, related to #1435135:


- Work around missing python[23] during build dependency parse
- Include ISA in the new python library version dependencies too

---

diff --git a/rpm.spec b/rpm.spec
index 31aa578..edf4cfc 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -15,7 +15,7 @@
 # build with new db format
 %bcond_with ndb
 
-%define pyver_cmd "import sys; sys.stdout.write(sys.version.split(' ')[0])"
+%define pyver_cmd "import sys; sys.stdout.write('= %s' % sys.version.split(' ')[0])"
 %define py2_fullver %(%{__python2} -c %{pyver_cmd})
 %define py3_fullver %(%{__python3} -c %{pyver_cmd})
 
@@ -33,7 +33,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}16%{?dist}
+Release: %{?snapver:0.%{snapver}.}17%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@@ -267,7 +267,7 @@ BuildRequires: python2-devel
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Provides: %{name}-python = %{version}-%{release}
 Obsoletes: %{name}-python < %{version}-%{release}
-Requires: python2-libs = %{py2_fullver}
+Requires: python2-libs%{?_isa} %{py2_fullver}
 
 %description -n python2-%{name}
 The python2-rpm package contains a module that permits applications
@@ -286,7 +286,7 @@ BuildRequires: python3-devel
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Provides: %{name}-python3 = %{version}-%{release}
 Obsoletes: %{name}-python3 < %{version}-%{release}
-Requires: system-python-libs = %{py3_fullver}
+Requires: system-python-libs%{?_isa} %{py3_fullver}
 
 %description -n python3-%{name}
 The python3-rpm package contains a module that permits applications
@@ -604,6 +604,10 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Mar 27 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0.1-17
+- Work around missing python[23] during build dependency parse
+- Include ISA in the new python library version dependencies too
+
 * Mon Mar 27 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0.1-16
 - Band-aid for python library versioning inadequacies (#1435135)