From ff629bc9da0b0fb4d207ff0e02341e4228d461e8 Mon Sep 17 00:00:00 2001 From: Ondřej Nosek Date: Sep 15 2019 23:27:59 +0000 Subject: Update koji dependency All needed koji builds were released, no need to specify version for various environments. Signed-off-by: Ondřej Nosek --- diff --git a/rpkg.spec b/rpkg.spec index 6afc6ec..702a935 100644 --- a/rpkg.spec +++ b/rpkg.spec @@ -4,7 +4,7 @@ Name: rpkg Version: 1.58 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Python library for interacting with rpm+git License: GPLv2+ and LGPLv2 @@ -53,12 +53,7 @@ BuildRequires: python2-devel # We br these things for man page generation due to imports BuildRequires: rpmlint -%if 0%{?rhel} && 0%{?rhel} < 8 -# TODO: Require 1.17 version of koji when it is released for RHEL -BuildRequires: python2-koji >= 1.16.2-32.6 -%else BuildRequires: python2-koji >= 1.17 -%endif BuildRequires: python2-cccolutils BuildRequires: PyYAML @@ -94,12 +89,7 @@ Requires: rpm-build Requires: rpmlint Requires: python2-cccolutils -%if 0%{?rhel} && 0%{?rhel} < 8 -# TODO: Require 1.17 version of koji when it is released for RHEL -Requires: python2-koji >= 1.16.2-32.6 -%else Requires: python2-koji >= 1.17 -%endif Requires: PyYAML %if 0%{?rhel} @@ -146,12 +136,11 @@ Obsoletes: python2-rpkg < %{version}-%{release} BuildRequires: python3-devel BuildRequires: python3-GitPython +BuildRequires: python3-koji >= 1.17 %if 0%{?rhel} > 7 -BuildRequires: python3-koji >= 1.16.2-32.6 -Requires: python3-gobject-base -Requires: libmodulemd +BuildRequires: python3-gobject-base +BuildRequires: libmodulemd %else -BuildRequires: python3-koji >= 1.17 BuildRequires: python3-libmodulemd1 %endif BuildRequires: python3-cccolutils @@ -172,12 +161,11 @@ Requires: rpmlint Requires: python3-GitPython >= 0.2.0 Requires: python3-cccolutils +Requires: python3-koji >= 1.17 %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 @@ -287,6 +275,9 @@ nosetests tests %changelog +* Mon Sep 16 2019 Ondřej Nosek - 1.58-10 +- Update koji dependency + * Sat Aug 17 2019 Miro Hrončok - 1.58-9 - Rebuilt for Python 3.8