diff --git a/1484.patch b/1484.patch deleted file mode 100644 index 2a54ece2..00000000 --- a/1484.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 9ea1098eaee9a6c1195d8b0e8e3073c2d4308cb4 Mon Sep 17 00:00:00 2001 -From: Lubomír Sedlář -Date: Jan 22 2021 07:33:09 +0000 -Subject: comps: Preserve default arg on groupid - - -When the wrapper processes comps file, it wasn't emitting "default" -argument for groupid element. The default is false and most entries are -actually using the default, so let's only emit it if set to true. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1882358 -Signed-off-by: Lubomír Sedlář - ---- - -diff --git a/pungi/wrappers/comps.py b/pungi/wrappers/comps.py -index 4eaddb0..aa7685b 100644 ---- a/pungi/wrappers/comps.py -+++ b/pungi/wrappers/comps.py -@@ -325,9 +325,8 @@ class CompsWrapper(object): - group_node.appendChild(packagelist) - - for category in self.comps.categories: -- groups = set(x.name for x in category.group_ids) & set( -- self.get_comps_groups() -- ) -+ group_ids = set(self.get_comps_groups()) -+ groups = set(g for g in category.group_ids if g.name in group_ids) - if not groups: - continue - cat_node = doc.createElement("category") -@@ -341,7 +340,7 @@ class CompsWrapper(object): - append_grouplist(doc, cat_node, groups) - - for environment in sorted(self.comps.environments, key=attrgetter("id")): -- groups = set(x.name for x in environment.group_ids) -+ groups = set(environment.group_ids) - if not groups: - continue - env_node = doc.createElement("environment") -@@ -356,10 +355,7 @@ class CompsWrapper(object): - - if environment.option_ids: - append_grouplist( -- doc, -- env_node, -- (x.name for x in environment.option_ids), -- "optionlist", -+ doc, env_node, set(environment.option_ids), "optionlist", - ) - - if self.comps.langpacks: -@@ -460,8 +456,11 @@ def append(doc, parent, elem, content=None, lang=None, **kwargs): - - def append_grouplist(doc, parent, groups, elem="grouplist"): - grouplist_node = doc.createElement(elem) -- for groupid in sorted(groups): -- append(doc, grouplist_node, "groupid", groupid) -+ for groupid in sorted(groups, key=lambda x: x.name): -+ kwargs = {} -+ if groupid.default: -+ kwargs["default"] = "true" -+ append(doc, grouplist_node, "groupid", groupid.name, **kwargs) - parent.appendChild(grouplist_node) - - - diff --git a/pungi.spec b/pungi.spec index 87337379..8d3da0cf 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,16 +1,15 @@ %{?python_enable_dependency_generator} Name: pungi -Version: 4.2.7 -Release: 3%{?dist} +Version: 4.2.8 +Release: 1%{?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/1484.patch -BuildRequires: make +BuildRequires: make BuildRequires: python3-nose BuildRequires: python3-mock BuildRequires: python3-devel @@ -138,6 +137,9 @@ nosetests-3 --exe %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Fri Feb 12 2021 Ondrej Nosek - 4.2.8-1 +- New upstream version + * Wed Jan 27 2021 Fedora Release Engineering - 4.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 1c9d5b06..37922a33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pungi-4.2.7.tar.bz2) = 415ff30b722809f4d539b33127324aa5fe7bbca60d5368255a55d1b5f73fdf99b15cdf7a4cf02b656c449aba43c545d8aa74e7b4f870ad1d0e42cb54284ca7b5 +SHA512 (pungi-4.2.8.tar.bz2) = 2120001c3d10c61ab426e02980b842e931b5c6ba77e779c9c2d816d380824e17de2c90484aba8f7bf4c8eb537068c3b66df71a455e109ab9e1c68b6cc803512f