[rpms/rpkg] 1.70-1: Fix libmodulemd requirements

[rpms/rpkg] 1.70-1: Fix libmodulemd requirements

[Stephen Gallagher]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 633dc7b908a37f22e0ca4c315cb573de383f1e4e
            Author : Stephen Gallagher <sgallagh@redhat.com>
            Date   : 2019-08-01T15:30:35+02:00
            Stats  : +12/-9 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/633dc7b908a37f22e0ca4c315cb573de383f1e4e?branch=1.70-1

            Log:
            Fix libmodulemd requirements

Requiring `libmodulemd` was incorrect, as that is the 2.x API,
which rpkg is not yet compatible with. This was working by
coincidence because libmodulemd1 is usually on most systems and
thus this would succeed to install and run, but the proper dep
here is on libmodulemd1 which provides the 1.x API being used by
rpkg.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
Merges: https://src.fedoraproject.org/rpms/rpkg/pull-request/31

---
diff --git a/rpkg.spec b/rpkg.spec
index c236e13..53d6976 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -4,7 +4,7 @@
 
 Name:           rpkg
 Version:        1.58
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -69,12 +69,11 @@ BuildRequires:  python-requests
 BuildRequires:  python-six >= 1.9.0
 %else
 BuildRequires:  python2-GitPython
-BuildRequires:  python2-gobject-base
 BuildRequires:  python2-pycurl
 BuildRequires:  python2-requests
 BuildRequires:  python2-six >= 1.9.0
 BuildRequires:  python2-openidc-client
-BuildRequires:  libmodulemd
+BuildRequires:  python2-libmodulemd1
 %endif
 
 %if 0%{?rhel} && 0%{?rhel} < 7
@@ -114,8 +113,7 @@ Requires:       python2-GitPython
 Requires:       python2-rpm
 Requires:       python2-pycurl
 Requires:       python2-six >= 1.9.0
-Requires:       python2-gobject-base
-Requires:       libmodulemd
+Requires:       python2-libmodulemd1
 %endif
 
 %if 0%{?rhel} && 0%{?rhel} < 7
@@ -146,8 +144,11 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-GitPython
 %if 0%{?rhel} > 7
 BuildRequires:  python3-koji >= 1.16.2-32.6
+Requires:       python3-gobject-base
+Requires:       libmodulemd
 %else
 BuildRequires:  python3-koji >= 1.17
+BuildRequires:  python3-libmodulemd1
 %endif
 BuildRequires:  python3-cccolutils
 BuildRequires:  python3-openidc-client
@@ -157,9 +158,7 @@ BuildRequires:  python3-six >= 1.9.0
 BuildRequires:  python3-requests
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-nose
-BuildRequires:  python3-gobject-base
 BuildRequires:  python3-PyYAML
-BuildRequires:  libmodulemd
 BuildRequires:  rpmlint
 
 Requires:       mock
@@ -171,15 +170,16 @@ Requires:       python3-GitPython >= 0.2.0
 Requires:       python3-cccolutils
 %if 0%{?rhel} > 7
 Requires:       python3-koji >= 1.16.2-32.6
+Requires:       python3-gobject-base
+Requires:       libmodulemd
 %else
 Requires:       python3-koji >= 1.17
+Requires:       python3-libmodulemd1
 %endif
 Requires:       python3-rpm
 Requires:       python3-pycurl
 Requires:       python3-six >= 1.9.0
-Requires:       python3-gobject-base
 Requires:       python3-PyYAML
-Requires:       libmodulemd
 
 Requires:       %{name}-common = %{version}-%{release}
 
@@ -283,6 +283,9 @@ nosetests tests
 
 
 %changelog
+* Wed Jul 31 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.58-7
+- Fix libmodulemd requirements
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.58-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild