From 7fb8550c797585645dd451ac0c2bcc062ad10405 Mon Sep 17 00:00:00 2001 From: Yuming Zhu Date: Mon, 11 May 2020 16:55:30 +0800 Subject: [PATCH 1/4] Recommends brew[-stage] instead of Requires --- ursa-major.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ursa-major.spec b/ursa-major.spec index 967422c..2a4ade0 100644 --- a/ursa-major.spec +++ b/ursa-major.spec @@ -104,7 +104,7 @@ Requires: python2-setuptools %endif # Need brewkoji.conf -Requires: brewkoji +Recommends: brewkoji %description @@ -117,7 +117,7 @@ Summary: A utility for working with module's koji tags in koji's tag inhe Requires: %{name} = %{version}-%{release} # Need brewkoji-stage.conf -Requires: brewkoji-stage +Recommends: brewkoji-stage %description -n ursa-major-stage The ursa-major-stage package contains script and configurations for Ursa-Major From 17b7abf7becdc6c3106362cd3ed54516474e6baf Mon Sep 17 00:00:00 2001 From: Yuming Zhu Date: Mon, 11 May 2020 16:59:49 +0800 Subject: [PATCH 2/4] Requires python3-m2crypto for python3 --- ursa-major.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ursa-major.spec b/ursa-major.spec index 2a4ade0..36a99bd 100644 --- a/ursa-major.spec +++ b/ursa-major.spec @@ -72,18 +72,19 @@ Requires: libmodulemd < 2 Requires: gobject-introspection Requires: krb5-workstation Requires: koji -Requires: m2crypto %if 0%{?with_python3} Requires: python3-gobject-base Requires: python3-cairo Requires: python3-koji +Requires: python3-m2crypto Requires: python3-six Requires: python3-requests Requires: python3-jinja2 Requires: python3-setuptools %else Requires: python2-koji +Requires: m2crypto %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-gobject-base Requires: pycairo From 1dee55b446fa5f5cc837798772a7774f20e8a45f Mon Sep 17 00:00:00 2001 From: Yuming Zhu Date: Mon, 11 May 2020 17:27:14 +0800 Subject: [PATCH 3/4] bump release - 0.4.1-2 --- ursa-major.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ursa-major.spec b/ursa-major.spec index 36a99bd..f8514f9 100644 --- a/ursa-major.spec +++ b/ursa-major.spec @@ -6,7 +6,7 @@ Name: ursa-major Version: 0.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A utility for working with module's koji tags in koji's tag inheritance. Group: Development/Tools @@ -193,6 +193,10 @@ done %changelog +* Mon May 11 2020 Yu Ming Zhu - 0.4.1-2 +- Requires python3-m2crypto for python3 +- Recommends brew[-stage] instead of Requires + * Tue Feb 11 2020 Qixiang Wan - 0.4.1-1 - Remove updating koji inheritance ability from add-module and remove-module From d0a8e94fa19a9189f3d37ce098e4631211779887 Mon Sep 17 00:00:00 2001 From: Yu Ming Zhu Date: Wed, 10 Mar 2021 17:37:47 +0000 Subject: [PATCH 4/4] Bump release - 0.4.2-1 --- .gitignore | 1 + sources | 2 +- ursa-major.spec | 41 ++++++++++++++++++++++++++--------------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 1a8c674..46b556d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /ursa-major-0.2.2.tar.gz /ursa-major-0.3.1.tar.gz /ursa-major-0.4.1.tar.gz +/ursa-major-0.4.2.tar.gz diff --git a/sources b/sources index 1a010c5..68b4ca9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ursa-major-0.4.1.tar.gz) = 7fbe6cc580ab6f256ab8d7866da677a8cebbe819b7d33f3bb83b041de5a143d2899460d27c650e77cc6704296ea9150e0ffa5c59af8136781b20544e85cdd652 +SHA512 (ursa-major-0.4.2.tar.gz) = 4758d0368af6b48063116fcbe59c6f22ab9ed0abf573e91bc8e4b2d0b1aee9b230986d659dc2559d3338e3633414e599b6f8bf8d1b1c6e74fb5d953870a5fb2a diff --git a/ursa-major.spec b/ursa-major.spec index f8514f9..65b03ff 100644 --- a/ursa-major.spec +++ b/ursa-major.spec @@ -1,12 +1,12 @@ -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 # we have some koji hubs doesn't support Python3 with kerberos auth # at this moment, so we build with Python2 for all platforms now %global with_python3 1 %endif Name: ursa-major -Version: 0.4.1 -Release: 2%{?dist} +Version: 0.4.2 +Release: 1%{?dist} Summary: A utility for working with module's koji tags in koji's tag inheritance. Group: Development/Tools @@ -59,14 +59,12 @@ BuildRequires: python2-mock %endif %endif -%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} > 7) -BuildRequires: libmodulemd1 -Requires: libmodulemd1 +%if 0%{?fedora} || 0%{?rhel} > 7 +BuildRequires: libmodulemd > 1 +Requires: libmodulemd > 1 %else -# disable unittest in check phase and build requires of libmodulemd v1 -# because libmodulemd has been upgraded to v2 in eng-rhel -# BuildRequires: libmodulemd -Requires: libmodulemd < 2 +BuildRequires: libmodulemd2 +Requires: libmodulemd2 %endif Requires: gobject-introspection @@ -105,7 +103,11 @@ Requires: python2-setuptools %endif # Need brewkoji.conf +%if 0%{?rhel} && 0%{?rhel} <= 7 +Requires: brewkoji +%else Recommends: brewkoji +%endif %description @@ -118,7 +120,11 @@ Summary: A utility for working with module's koji tags in koji's tag inhe Requires: %{name} = %{version}-%{release} # Need brewkoji-stage.conf +%if 0%{?rhel} && 0%{?rhel} <= 7 +Requires: brewkoji-stage +%else Recommends: brewkoji-stage +%endif %description -n ursa-major-stage The ursa-major-stage package contains script and configurations for Ursa-Major @@ -165,11 +171,11 @@ done %check # disable unittest due to missing libmodulemd v1 in buildroot -# %if 0%{?with_python3} -# py.test-3 -# %else -# py.test -# %endif +%if 0%{?with_python3} +py.test-3 +%else +py.test +%endif %files @@ -193,6 +199,11 @@ done %changelog +* Thu Mar 11 2021 Yu Ming Zhu - 0.4.2-1 +- Use old tuple syntax for mock.call.call_args of old mock release (Yuming Zhu) +- Fix unittests for missing koji profile (Yuming Zhu) +- Using libmodulemd v2 API (Yuming Zhu) + * Mon May 11 2020 Yu Ming Zhu - 0.4.1-2 - Requires python3-m2crypto for python3 - Recommends brew[-stage] instead of Requires