From aefdba749896dcb2ff8b7a8c29b8a3f5cd25256a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Fri, 6 Dec 2019 09:51:45 +0100 Subject: [PATCH] Add version constraint for productmd --- 1311.patch | 26 ++++++++++++++++++++++++++ pungi.spec | 6 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 1311.patch diff --git a/1311.patch b/1311.patch new file mode 100644 index 00000000..e8fd5f81 --- /dev/null +++ b/1311.patch @@ -0,0 +1,26 @@ +From 0f53506765d035d760ebe0961957623370d61a34 Mon Sep 17 00:00:00 2001 +From: Lubomír Sedlář +Date: Dec 06 2019 08:49:01 +0000 +Subject: Add version constraint to productmd dependency + + +This should be propagated to RPM level with F30+. + +Signed-off-by: Lubomír Sedlář + +--- + +diff --git a/setup.py b/setup.py +index 79e56a9..bbabc40 100755 +--- a/setup.py ++++ b/setup.py +@@ -61,7 +61,7 @@ setup( + "jsonschema", + "kobo", + "lxml", +- "productmd", ++ "productmd>=1.23", + "six", + 'dogpile.cache', + ], + diff --git a/pungi.spec b/pungi.spec index 8b78e187..2ff068f9 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,13 +2,14 @@ Name: pungi Version: 4.1.41 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distribution compose tool License: GPLv2 URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: https://pagure.io/pungi/pull-request/1310.patch +Patch1: https://pagure.io/pungi/pull-request/1311.patch BuildRequires: python3-nose BuildRequires: python3-mock @@ -142,6 +143,9 @@ nosetests-3 --exe %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Fri Dec 06 2019 Lubomír Sedlář - 4.1.41-3 +- Add version constraint for productmd + * Thu Dec 05 2019 Lubomír Sedlář - 4.1.41-2 - Avoid crash when module has limited arches