The package rpms/libmodulemd.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libmodulemd.git/commit/?id=0bc81e....
Change:
-%ifnarch %{valgrind_arches}
Thanks.
Full change:
============
commit 953a664396015750ba68735f177258f92e47c4ca
Merge: 4df0bca 3949089
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed May 20 15:50:46 2020 -0400
Merge branch 'master' into f31
commit 3949089b57411443617630aa2fa65df3d6707bfc
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed May 20 15:47:32 2020 -0400
[packit] 2.9.4 upstream release
Upstream tag: libmodulemd-2.9.4
Upstream commit: c7254db0
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 9bd3da9..de09399 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -14,7 +14,7 @@
Name: %{upstream_name}%{?v2_suffix}
Version: 2.9.4
-Release: 2.9.300520.1gitgc19757c%{?dist}
+Release: 1%{?dist}
Summary: Module metadata manipulation library
License: MIT
@@ -163,6 +163,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
%changelog
+* Wed May 20 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 2.9.4-1
+- new upstream release: 2.9.4
+
* Wed May 20 2020 Stephen Gallagher <sgallagh(a)redhat.com> -
2.9.4-2.9.300520.1gitgc19757c
- new upstream release: 2.9.4
commit 0bc81ec0ad231bb45db99eae499c7d01936c7d88
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed May 20 15:40:22 2020 -0400
[packit] 2.9.4 upstream release
Upstream tag: libmodulemd-2.9.4
Upstream commit: c7254db0
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 1a63ee0..75e3b62 100644
--- a/.gitignore
+++ b/.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
diff --git a/README.packit b/README.packit
index 7fa1bff..c3895b5 100644
--- a/README.packit
+++ b/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.
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 8d682c7..9bd3da9 100644
--- a/libmodulemd.spec
+++ b/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,8 +13,8 @@
%endif
Name: %{upstream_name}%{?v2_suffix}
-Version: 2.9.3
-Release: 1%{?dist}
+Version: 2.9.4
+Release: 2.9.300520.1gitgc19757c%{?dist}
Summary: Module metadata manipulation library
License: MIT
@@ -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,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
%changelog
+* Wed May 20 2020 Stephen Gallagher <sgallagh(a)redhat.com> -
2.9.4-2.9.300520.1gitgc19757c
+- new upstream release: 2.9.4
+
* Wed Apr 08 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 2.9.3-1
- new upstream release: 2.9.3
diff --git a/sources b/sources
index c160d1f..113935d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-2.9.3.tar.xz) =
48f09210a42ac6e8ee25cc4c1cf4ac527339ec4fa580f0f98766243d53d7b71e45d3a63d32be2efa9143d2d145652ea7cb12f8f0135e886304350c8210d7c884
+SHA512 (modulemd-2.9.4.tar.xz) =
f1feec56507cf294ce01a24b77fb851671d331408ecf7dd453eb2b39dc5eb5548b6376b6b1b8e5ccbc75503e1260651e8c1995e2d3b29830e1c322451f861a11
commit 84f2ca4ce507a8b4f9213789018cfcd906736106
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed Apr 8 12:13:57 2020 -0400
Drop upstreamed patch
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/0001-additional-valgrind-suppression-for-Python-3.9.patch
b/0001-additional-valgrind-suppression-for-Python-3.9.patch
deleted file mode 100644
index 1eafb6b..0000000
--- a/0001-additional-valgrind-suppression-for-Python-3.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b1feeb990f536147d5c49c6d002b04a9436eeea2 Mon Sep 17 00:00:00 2001
-From: Merlin Mathesius <mmathesi(a)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
-