Merge branch 'master' into f32

.gitignore

@@ -45,3 +45,4 @@
 /modulemd-2.9.1.tar.xz
 /modulemd-2.9.2.tar.xz
 /modulemd-2.9.3.tar.xz
+/modulemd-2.9.4.tar.xz

0001-additional-valgrind-suppression-for-Python-3.9.patch

@@ -1,37 +0,0 @@
-From b1feeb990f536147d5c49c6d002b04a9436eeea2 Mon Sep 17 00:00:00 2001
-From: Merlin Mathesius <mmathesi@redhat.com>
-Date: Fri, 27 Mar 2020 13:53:13 -0500
-Subject: [PATCH] additional valgrind suppression for Python 3.9
-
----
- contrib/valgrind/libmodulemd-python.supp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/contrib/valgrind/libmodulemd-python.supp b/contrib/valgrind/libmodulemd-python.supp
-index fe9814d86daa340ec1283becee78514d1d93e3ff..080669825eab28459e032488f348cf8a90455e23 100644
---- a/contrib/valgrind/libmodulemd-python.supp
-+++ b/contrib/valgrind/libmodulemd-python.supp
-@@ -54,10 +54,20 @@
-    fun:g_malloc
-    fun:g_strdup
-    ...
-    fun:PyObject_SetAttr
- }
-+{
-+   Handle Python 3.9 PyMalloc confusing valgrind
-+   Memcheck:Leak
-+   fun:malloc
-+   fun:PyThread_allocate_lock
-+   ...
-+   fun:Py_InitializeFromConfig
-+   ...
-+   fun:Py_BytesMain
-+}
- {
-    Python3 Unicode uninitialized value
-    Memcheck:Cond
-    fun:PyUnicode_Decode
-    ...
--- 
-2.25.1
-

README.packit

@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.7.1.
+The file was generated using packit 0.10.1.

libmodulemd.spec

@@ -1,5 +1,4 @@
-# Python 2 is dead on F31+
-%if ( 0%{?fedora} && 0%{?fedora} <= 30 ) || ( 0%{?rhel} && 0%{?rhel} <= 7)
+%if  0%{?rhel} && 0%{?rhel} <= 7
   %global meson_python_flags -Dwith_py2=true
   %global build_python2 1
 %else
@@ -14,7 +13,7 @@
 %endif
 
 Name:           %{upstream_name}%{?v2_suffix}
-Version:        2.9.3
+Version:        2.9.4
 Release:        1%{?dist}
 Summary:        Module metadata manipulation library
 
@@ -39,9 +38,6 @@ BuildRequires:  python-gobject-base
 %endif
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-gobject-base
-%ifarch %{valgrind_arches}
-BuildRequires:  valgrind
-%endif
 BuildRequires:  help2man
 
 
@@ -101,7 +97,6 @@ Development files for libmodulemd.
 
 %build
 %meson -Ddeveloper_build=false \
-       -Dskip_formatters=true \
        %{meson_python_flags}
 
 %meson_build
@@ -111,15 +106,6 @@ Development files for libmodulemd.
 
 export LC_CTYPE=C.utf8
 
-%ifarch %{power64} s390x
-# Valgrind is broken on ppc64[le] with GCC7:
-# https://bugs.kde.org/show_bug.cgi?id=386945
-export MMD_SKIP_VALGRIND=1
-%endif
-%ifnarch %{valgrind_arches}
-export MMD_SKIP_VALGRIND=1
-%endif
-
 # Don't run tests on ARM for now. There are problems with
 # performance on the builders and often these time out.
 %ifnarch %{arm} aarch64
@@ -177,6 +163,12 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
 
 
 %changelog
+* Wed May 20 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.4-1
+- new upstream release: 2.9.4
+
+* Wed May 20 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.4-2.9.300520.1gitgc19757c
+- new upstream release: 2.9.4
+
 * Wed Apr 08 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.3-1
 - new upstream release: 2.9.3
 

sources

@@ -1 +1 @@
-SHA512 (modulemd-2.9.3.tar.xz) = 48f09210a42ac6e8ee25cc4c1cf4ac527339ec4fa580f0f98766243d53d7b71e45d3a63d32be2efa9143d2d145652ea7cb12f8f0135e886304350c8210d7c884
+SHA512 (modulemd-2.9.4.tar.xz) = f1feec56507cf294ce01a24b77fb851671d331408ecf7dd453eb2b39dc5eb5548b6376b6b1b8e5ccbc75503e1260651e8c1995e2d3b29830e1c322451f861a11