Merge branch 'master' into f30

Upstream tag: libmodulemd-2.9.2
Upstream commit: 780750ea

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,8 +1,3 @@
-/.build*.log
-*~
-*.swp
-*.rpm
-/modulemd-*/
 /modulemd-0.1.0.tar.xz
 /modulemd-0.2.0.tar.xz
 /modulemd-0.2.1.tar.xz
@@ -50,21 +45,3 @@
 /modulemd-2.9.1.tar.xz
 /modulemd-2.9.2.tar.xz
 /modulemd-2.9.3.tar.xz
-/modulemd-2.9.4.tar.xz
-/modulemd-2.10.0.tar.xz
-/modulemd-2.11.0.tar.xz
-/modulemd-2.11.1.tar.xz
-/modulemd-2.11.2.tar.xz
-/modulemd-2.12.0.tar.xz
-/modulemd-2.12.1.tar.xz
-/modulemd-2.12.1.tar.xz.asc
-/modulemd-2.13.0.tar.xz
-/modulemd-2.13.0.tar.xz.asc
-/modulemd-2.14.0.tar.xz
-/modulemd-2.14.0.tar.xz.asc
-/modulemd-2.15.0.tar.xz
-/modulemd-2.15.0.tar.xz.asc
-/modulemd-2.15.1.tar.xz
-/modulemd-2.15.1.tar.xz.asc
-/modulemd-2.15.2.tar.xz
-/modulemd-2.15.2.tar.xz.asc

.packit.yml

@@ -2,11 +2,10 @@ specfile_path: libmodulemd.spec
 upstream_package_name: libmodulemd
 downstream_package_name: libmodulemd
 upstream_tag_template: libmodulemd-{version}
+current_version_command:
+  - ./.packit_version.sh
 
-actions:
+synced_files:
-  get-current-version: ./.packit_version.sh
-
-files_to_sync:
   - .packit.yml
   - .make_packit_specfile.sh
   - libmodulemd.spec

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

@@ -0,0 +1,37 @@
+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.10.1.
+The file was generated using packit 0.7.1.

gating.yaml

@@ -1,16 +1,17 @@
 --- !Policy
 product_versions:
-  - fedora-rawhide
+  - fedora-*
-decision_context: bodhi_update_push_stable
+decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: dist.abicheck}
+
 --- !Policy
 product_versions:
   - fedora-*
 decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional}
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: dist.abicheck}

libmodulemd.spec

@@ -1,19 +1,10 @@
-%if  0%{?rhel} && 0%{?rhel} <= 7
+# Python 2 is dead on F31+
-  # There is no python3-gobject-base in RHEL 7. But it exists in EPEL 7.
+%if ( 0%{?fedora} && 0%{?fedora} <= 30 ) || ( 0%{?rhel} && 0%{?rhel} <= 7)
-  %global meson_python_flags -Dwith_py2=true -Dwith_py3=true
+  %global meson_python_flags -Dwith_py2=true
   %global build_python2 1
-  %global build_python3 1
 %else
-  %global meson_python_flags -Dwith_py2=false -Dwith_py3=true
+  %global meson_python_flags -Dwith_py2=false
   %global build_python2 0
-  %global build_python3 1
-%endif
-
-%if (0%{?fedora} && 0%{?fedora} <= 50) || (0%{?rhel} && 0%{?rhel} <= 10)
-  # Support RHEL 8 module builds with an invalid buildorder.
-  %global meson_accept_overflowed_buildorder_flag -Daccept_overflowed_buildorder=true
-%else
-  %global meson_accept_overflowed_buildorder_flag -Daccept_overflowed_buildorder=false
 %endif
 
 %global upstream_name libmodulemd
@@ -23,28 +14,14 @@
 %endif
 
 Name:           %{upstream_name}%{?v2_suffix}
-Version:        2.15.2
+Version:        2.9.3
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        Module metadata manipulation library
 
-# COPYING:      MIT
-## not in any binary package
-# contrib/coverity-modeling.c:  GPL-2.0-or-later
-# contrib/release-tools/semver: GPL-3.0-only
-# modulemd/tests/test_data/f29.yaml:            Apache-2.0
-# modulemd/tests/test_data/f29-updates.yaml:    Apache-2.0
-# xml_specs/reduced/tests/good/module_stream_build_license.xml: MIT AND GPL-3.0-or-later
 License:        MIT
-SourceLicense:  %{license} AND GPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND Apache-2.0
 URL:            https://github.com/fedora-modularity/libmodulemd
-Source0:        %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz
+Source0:        %{url}/releases/download/%{upstream_name}-%{version}/modulemd-%{version}.tar.xz
-Source1:        %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz.asc
-# Key exported from Petr Pisar's keyring
-Source2:        gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg
-# Adapt tests to glib2-2.87.0, in upstream after 2.15.2, bug #2423153
-Patch0:         modulemd-2.15.2-tests-Adapt-to-glib-2.87.0.patch
 
-BuildRequires:  gnupg2
 BuildRequires:  meson >= 0.47
 BuildRequires:  pkgconfig
 BuildRequires:  gcc
@@ -55,53 +32,54 @@ BuildRequires:  pkgconfig(yaml-0.1)
 BuildRequires:  pkgconfig(gtk-doc)
 BuildRequires:  glib2-doc
 BuildRequires:  rpm-devel
+BuildRequires:  file-devel
 %if %{build_python2}
 BuildRequires:  python2-devel
 BuildRequires:  python-gobject-base
 %endif
-%if %{build_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-gobject-base
+%ifarch %{valgrind_arches}
+BuildRequires:  valgrind
 %endif
-%if 0%{?fedora} >= 40 && 0%{?fedora} < 42
+BuildRequires:  help2man
-# glib2 version with g_once_init_enter_pointer symbol, bug #2265336
+
-Requires:       glib2 >= 2.79.0-2
+
-%endif
+# Patches
 
 
 %description
-C library for manipulating module metadata files.
+C Library for manipulating module metadata files.
-See https://github.com/fedora-modularity/libmodulemd/blob/main/README.md for
+See https://github.com/fedora-modularity/libmodulemd/blob/master/README.md for
 more details.
 
 
 %if %{build_python2}
 %package -n python2-%{name}
-Summary:        Python 2 bindings for %{name}
+Summary: Python 2 bindings for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires:       python-gobject-base
+Requires: python-gobject-base
-Requires:       python-six
+Requires: python-six
 
 %description -n python2-%{name}
-Python 2 bindings for %{name}.
+Python 2 bindings for %{name}
 %endif
 
 
-%if %{build_python3}
 %package -n python%{python3_pkgversion}-%{name}
-Summary:        Python 3 bindings for %{name}
+Summary: Python 3 bindings for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires:       python%{python3_pkgversion}-gobject-base
+Requires: python%{python3_pkgversion}-gobject-base
+
 %if (0%{?rhel} && 0%{?rhel} <= 7)
 # The py3_dist macro on EPEL 7 doesn't work right at the moment
-Requires:       python3.6dist(six)
+Requires: python3.6dist(six)
 %else
-Requires:       %{py3_dist six}
+Requires: %{py3_dist six}
 %endif
 
 %description -n python%{python3_pkgversion}-%{name}
-Python %{python3_pkgversion} bindings for %{name}.
+Python %{python3_pkgversion} bindings for %{name}
-%endif
 
 
 %package devel
@@ -114,30 +92,40 @@ Conflicts:      libmodulemd-devel
 
 
 %description devel
-Development files for %{name}.
+Development files for libmodulemd.
 
 
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1 -n modulemd-%{version}
 
 
 %build
-%meson \
+%meson -Ddeveloper_build=false \
-    %{meson_accept_overflowed_buildorder_flag} \
+       -Dskip_formatters=true \
-    -Drpmio=enabled \
+       %{meson_python_flags}
-    -Dskip_introspection=false \
+
-    -Dtest_installed_lib=false \
-    -Dwith_docs=true \
-    -Dwith_manpages=enabled \
-    %{meson_python_flags}
 %meson_build
 
 
 %check
+
 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
 # The tests sometimes time out in CI, so give them a little extra time
 %{__meson} test -C %{_vpath_builddir} %{?_smp_mesonflags} --print-errorlogs -t 5
+%endif
 
 
 %install
@@ -159,7 +147,7 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
 
 %files
 %license COPYING
-%doc NEWS README.md
+%doc README.md
 %{_bindir}/modulemd-validator%{?v2_suffix}
 %{_mandir}/man1/modulemd-validator%{?v2_suffix}.1*
 %{_libdir}/%{upstream_name}.so.2*
@@ -184,160 +172,11 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
 %endif
 
 
-%if %{build_python3}
 %files -n python%{python3_pkgversion}-%{name}
 %{python3_sitearch}/gi/overrides/
-%endif
 
 
 %changelog
-* Wed Jan 14 2026 Petr Pisar <ppisar@redhat.com> - 2.15.2-5
-- Adapt tests to glib2-2.87.0 (bug #2423153)
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 2.15.2-4
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 2.15.2-3
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed Jun 18 2025 Petr Pisar <ppisar@redhat.com> - 2.15.2-1
-- 2.15.2 bump
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 2.15.1-2
-- Rebuilt for Python 3.14
-
-* Fri May 09 2025 Petr Pisar <ppisar@redhat.com> - 2.15.1-1
-- 2.15.1 bump
-
-* Mon Jan 20 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2.15.0-13
-- Rebuilt for Python 3.13
-
-* Thu May 16 2024 Petr Pisar <ppisar@redhat.com> - 2.15.0-12
-- Use canonical "dnf builddep" command in STI tests
-
-* Wed May 15 2024 Petr Pisar <ppisar@redhat.com> - 2.15.0-11
-- Do not install Python 2 packages in Fedora STI tests
-
-* Wed May 15 2024 Petr Pisar <ppisar@redhat.com> - 2.15.0-10
-- Fix building with glib2-doc 2.80.1 (upstream bug #619)
-
-* Tue Feb 27 2024 Petr Pisar <ppisar@redhat.com> - 2.15.0-9
-- Require glib2 version with g_once_init_enter_pointer symbol (bug #2265336)
-
-* Mon Jan 29 2024 Petr Pisar <ppisar@redhat.com> - 2.15.0-8
-- Fix building with glib2-doc 2.79.0
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 2.15.0-4
-- Rebuilt for Python 3.12
-
-* Wed May 10 2023 Florian Festi <ffesti@redhat.com>  - 2.15.0-3
-- Rebuild for rpm-4.18.90
-
-* Wed May 10 2023 Petr Pisar <ppisar@redhat.com> - 2.15.0-2
-- Adapt STI tests to current meson
-
-* Wed May 10 2023 Petr Pisar <ppisar@redhat.com> - 2.15.0-1
-- 2.15.0 bump
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.14.0-3
-- Rebuilt for Python 3.11
-
-* Tue Feb 08 2022 Petr Pisar <ppisar@redhat.com> - 2.14.0-2
-- Drop removed meson -D developer_build option from CI tests
-
-* Fri Feb 04 2022 Petr Pisar <ppisar@redhat.com> - 2.14.0-1
-- 2.14.0 bump
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Sep 14 2021 Petr Pisar <ppisar@redhat.com> - 2.13.0-3
-- Accept an invalid buildorder 18446744073709551615 found in RHEL 8 repositories
-  (https://pagure.io/koji/issue/3025)
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jul 09 2021 Petr Pisar <ppisar@redhat.com> - 2.13.0-1
-- 2.13.0 bump
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.12.1-2
-- Rebuilt for Python 3.10
-
-* Mon May 03 2021 Petr Pisar <ppisar@redhat.com> - 2.12.1-1
-- 2.12.1 bump
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 2021 Stephen Gallagher <sgallagh@redhat.com> - 2.12.0-1
-- Add support for 'buildorder' to Packager documents
-
-* Tue Jan 12 2021 Stephen Gallagher <sgallagh@redhat.com> - 2.11.2-2
-- Fix issue with ModuleIndex when input contains only Obsoletes documents
-- Fix import issue when built with Python 2 support
-
-* Thu Jan 07 2021 Stephen Gallagher <sgallagh@redhat.com> - 2.11.2-1
-- Release 2.11.2
-- Extend read_packager_[file|string]() to support overriding the module name
-  and stream.
-
-* Thu Dec 17 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.11.1-1
-- Release 2.11.1
-- Ignore Packager documents when running ModuleIndex.update_from_*()
-- Add python overrides for XMD in PackagerV3
-- Add python override to ignore the GType return when reading packager files
-- Add PackagerV3.get_mdversion()
-
-* Thu Dec 10 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.11.0-1
-- Release 2.11.0
-
-* Fri Nov 20 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.10.0-2
-- Fix integer size issue on 32-bit platforms
-
-* Fri Nov 20 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.10.0-1
-- Release 2.10.0
-- https://github.com/fedora-modularity/libmodulemd/releases/tag/libmodulemd-2.10.0
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 2.9.4-2
-- Rebuilt for Python 3.9
-
-* 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
 

plans/sanity.fmf

@@ -1,5 +0,0 @@
-summary: Sanity tests
-discover:
-    how: fmf
-execute:
-    how: tmt

sources

@@ -1,2 +1 @@
-SHA512 (modulemd-2.15.2.tar.xz) = d1785f6982ed19292103d741e3e94581e9789737be6f8e90d19218296f3aeb87d6589f3247744f8eab4f714d298d1508312b119624a8c32086c720becfa4cdc5
+SHA512 (modulemd-2.9.3.tar.xz) = 48f09210a42ac6e8ee25cc4c1cf4ac527339ec4fa580f0f98766243d53d7b71e45d3a63d32be2efa9143d2d145652ea7cb12f8f0135e886304350c8210d7c884
-SHA512 (modulemd-2.15.2.tar.xz.asc) = 282ff35f15418e95aae09d9bff8084aa0b6f2732cea3934a84a1bd4ddd8e50c8375466acb6a39a6e632f4bbbefd49735b7f56e9304d52521786e245f52feae24

tests/tests.yml

@@ -0,0 +1,32 @@
+---
+- hosts: localhost
+  tags:
+    - classic
+  roles:
+  - role: standard-test-source
+
+- hosts: localhost
+  tags:
+    - classic
+  tasks:
+  - name: Make sure fedpkg and selinux bindings are installed
+    shell: dnf -y install fedpkg python{2,3}-libselinux libmodulemd-devel --skip-broken
+  - name: Copy spec file to remote machine
+    copy:
+      src: "{{ playbook_dir }}/../libmodulemd.spec"
+      dest: /tmp/libmodulemd.spec
+  - name: Install build deps
+    shell: dnf -y build-dep /tmp/libmodulemd.spec
+
+- hosts: localhost
+  tags:
+    - classic
+  roles:
+  - role: standard-test-basic
+    tests:
+    - build:
+        dir: .
+        run: meson -Dtest_installed_lib=true -Ddeveloper_build=false source
+    - unittests:
+        dir: .
+        run: ninja test

tests/upstream-tests.fmf

@@ -1,15 +0,0 @@
-summary: Upstream tests
-component: libmodulemd
-require:
-    - bash
-    - dnf5
-    - dnf5-command(builddep)
-    - fedpkg
-    - libmodulemd
-    - koji
-    - meson
-    - ninja
-    - rpm
-    - rpmdevtools
-duration: 10m
-test: ./upstream-tests.sh

tests/upstream-tests.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-set -ex
-DIR=$(mktemp -d)
-pushd "$DIR"
-
-SRCRPM=$(rpm -q --qf '%{sourcerpm}' libmodulemd)
-koji download-build -a src "$SRCRPM"
-rpmdev-extract "$SRCRPM"
-
-NAME=$(rpm -q --qf %{name} "$SRCRPM")
-VERSION=$(rpm -q --qf %{version} "$SRCRPM")
-pushd "${SRCRPM//.rpm}"
-dnf -y builddep "$NAME".spec
-fedpkg prep
-
-meson setup -Daccept_overflowed_buildorder=true -Drpmio=enabled \
-    -Dskip_introspection=false -Dtest_installed_lib=true \
-    -Dwith_py2=false -Dwith_py3=true \
-    ./build "${NAME}-${VERSION}-build/modulemd-${VERSION}"
-ninja -C ./build
-meson test -C ./build
-
-popd
-
-popd
-rm -r "$DIR"