#31 Fix libmodulemd requirements
Closed 4 years ago by onosek. Opened 4 years ago by sgallagh.
rpms/ sgallagh/rpkg master  into  master

file modified
+8 -9
@@ -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-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-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
@@ -157,9 +155,8 @@ 

  BuildRequires:  python3-requests

  BuildRequires:  python3-setuptools

  BuildRequires:  python3-nose

- BuildRequires:  python3-gobject-base

  BuildRequires:  python3-PyYAML

- BuildRequires:  libmodulemd

+ BuildRequires:  python3-libmodulemd1

  BuildRequires:  rpmlint

  

  Requires:       mock
@@ -177,9 +174,8 @@ 

  Requires:       python3-rpm

  Requires:       python3-pycurl

  Requires:       python3-six >= 1.9.0

- Requires:       python3-gobject-base

  Requires:       python3-PyYAML

- Requires:       libmodulemd

+ Requires:       python3-libmodulemd1

  

  Requires:       %{name}-common = %{version}-%{release}

  
@@ -283,6 +279,9 @@ 

  

  

  %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

  

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

Thanks,
I did one modification: I use the same specfile for internal RHEL builds. In RHEL there is no python3-libmodulemd1. So I had to place the dependency into if-condition.

This commit was pushed: https://src.fedoraproject.org/rpms/rpkg/c/633dc7?branch=master

Pull-Request has been closed by onosek

4 years ago
Metadata