14 changed files with 87 additions and 2534 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.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
@ -45,26 +40,3 @@
 /modulemd-2.8.0.tar.xz
 /modulemd-2.8.1.tar.xz
 /modulemd-2.8.2.tar.xz
-/modulemd-2.8.3.tar.xz
-/modulemd-2.9.0.tar.xz
-/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
--- a/.make_packit_specfile.sh
+++ b/.make_packit_specfile.sh
@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-pushd $SCRIPT_DIR
-
-date=$(date +%Y%m%d)
-version_desc=$(git describe --tags --match "*.*")
-version=$(echo $version_desc | cut -d '-' -f2)
-patch_count=$(echo $version_desc | cut -d '-' -f3)
-hash=$(echo $version_desc | cut -d '-' -f4)
-
-if [ x$patch_count != x ]; then
-    release=0.${date}.${patch_count}git${hash}%{?dist}
-else
-    release=1%{?dist}
-fi
-
-./spec_tmpl.sh version=$version release=$release template=libmodulemd.spec.in > libmodulemd.spec
-
-popd
--- a/.packit.yml
+++ b/.packit.yml
@ -1,28 +0,0 @@
-specfile_path: libmodulemd.spec
-upstream_package_name: libmodulemd
-downstream_package_name: libmodulemd
-upstream_tag_template: libmodulemd-{version}
-
-actions:
-  get-current-version: ./.packit_version.sh
-
-files_to_sync:
-  - .packit.yml
-  - .make_packit_specfile.sh
-  - libmodulemd.spec
-
-actions:
-    post-upstream-clone: ./.make_packit_specfile.sh
-
-jobs:
- job: copr_build
-  trigger: pull_request
-  metadata:
-    targets:
-    - fedora-all
-    - epel-7
-
- job: propose_downstream
-  trigger: release
-  metadata:
-    dist-git-branch: fedora-all
--- a/README.packit
+++ b/README.packit
@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 0.10.1.
--- a/gating.yaml
+++ b/gating.yaml
@ -1,16 +0,0 @@
--- !Policy
-product_versions:
-  - fedora-rawhide
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional}
--- !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}
--- a/gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg
+++ b/gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@ -1,50 +1,21 @@
-%if  0%{?rhel} && 0%{?rhel} <= 7
-  # There is no python3-gobject-base in RHEL 7. But it exists in EPEL 7.
-  %global meson_python_flags -Dwith_py2=true -Dwith_py3=true
+# Python 2 is dead on F31+
+%if ( 0%{?fedora} && 0%{?fedora} <= 30 ) || ( 0%{?rhel} && 0%{?rhel} <= 7)
+  %global meson_override_flags -Dwith_py3_overrides=true -Dwith_py2_overrides=true
  %global build_python2 1
-  %global build_python3 1
 %else
-  %global meson_python_flags -Dwith_py2=false -Dwith_py3=true
+  %global meson_override_flags -Dwith_py3_overrides=true -Dwith_py2_overrides=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
-
-%if (0%{?rhel} && 0%{?rhel} <= 7)
-  %global v2_suffix 2
-%endif
-
-Name:           %{upstream_name}%{?v2_suffix}
-Version:        2.15.2
-Release:        5%{?dist}
+Name:           libmodulemd
+Version:        2.8.2
+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
-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
+Source0:        %{url}/releases/download/%{name}-%{version}/modulemd-%{version}.tar.xz

-BuildRequires:  gnupg2
 BuildRequires:  meson >= 0.47
 BuildRequires:  pkgconfig
 BuildRequires:  gcc
@ -55,120 +26,103 @@ 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
-%endif
-%if 0%{?fedora} >= 40 && 0%{?fedora} < 42
-# glib2 version with g_once_init_enter_pointer symbol, bug #2265336
-Requires:       glib2 >= 2.79.0-2
+BuildRequires:  python3-devel
+BuildRequires:  python3-gobject-base
+%ifarch %{valgrind_arches}
+BuildRequires:  valgrind
 %endif

+# Patches
+

 %description
-C library for manipulating module metadata files.
-See https://github.com/fedora-modularity/libmodulemd/blob/main/README.md for
+C Library for manipulating module metadata files.
+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}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       python-gobject-base
-Requires:       python-six
+Summary: Python 2 bindings for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python-gobject-base
+Requires: python-six
+Obsoletes: python2-modulemd < 1.3.4

 %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}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-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)
-%else
-Requires:       %{py3_dist six}
-%endif
+%package -n python3-%{name}
+Summary: Python 3 bindings for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python3-gobject-base
+Requires: %{py3_dist six}
+Obsoletes: python3-modulemd < 1.3.4

-%description -n python%{python3_pkgversion}-%{name}
-Python %{python3_pkgversion} bindings for %{name}.
-%endif
+%description -n python3-%{name}
+Python 3 bindings for %{name}


 %package devel
 Summary:        Development files for libmodulemd
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-%if (0%{?rhel} && 0%{?rhel} <= 7)
-Conflicts:      libmodulemd1-devel
-Conflicts:      libmodulemd-devel
-%endif


 %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_accept_overflowed_buildorder_flag} \
-    -Drpmio=enabled \
-    -Dskip_introspection=false \
-    -Dtest_installed_lib=false \
-    -Dwith_docs=true \
-    -Dwith_manpages=enabled \
-    %{meson_python_flags}
+%meson -Ddeveloper_build=false %{meson_override_flags}
 %meson_build


 %check
+
 export LC_CTYPE=C.utf8
-# 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
+
+%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
+%meson_test
+%endif


 %install
 %meson_install

-%if ( 0%{?rhel} && 0%{?rhel} <= 7)
-# Don't conflict with modulemd-validator from 1.x included in the official
-# RHEL 7 repos
-mv %{buildroot}%{_bindir}/modulemd-validator \
-   %{buildroot}%{_bindir}/modulemd-validator%{?v2_suffix}
-
-mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
-   %{buildroot}%{_mandir}/man1/modulemd-validator%{?v2_suffix}.1
-%endif
-
-
-%ldconfig_scriptlets
-

 %files
 %license COPYING
-%doc NEWS README.md
-%{_bindir}/modulemd-validator%{?v2_suffix}
-%{_mandir}/man1/modulemd-validator%{?v2_suffix}.1*
-%{_libdir}/%{upstream_name}.so.2*
+%doc README.md
+%{_bindir}/modulemd-validator
+%{_libdir}/%{name}.so.2*
 %dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/Modulemd-2.0.typelib


 %files devel
-%{_libdir}/%{upstream_name}.so
+%{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/modulemd-2.0.pc
 %{_includedir}/modulemd-2.0/
 %dir %{_datadir}/gir-1.0
@ -184,194 +138,11 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
 %endif


-%if %{build_python3}
-%files -n python%{python3_pkgversion}-%{name}
+%files -n python3-%{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
-
-* Wed Apr 01 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.2-4
- Skip rpmdeplint from gating due to https://github.com/fedora-infra/bodhi/issues/3944
-
-* Wed Apr 01 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.2-3
- Fix build against Python 3.9
- Resolves: rhbz#1817665
-
-* Wed Mar 11 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.2-2
- new upstream release: 2.9.2
-
-* Wed Mar 11 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.2-0.20200311.1gitg31bbd4e
- new upstream release: 2.9.2
-
-* Wed Mar 11 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.2-0.20200311.1gitg31bbd4e
- new upstream release: 2.9.2
-
-* Fri Feb 14 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.1-1
- new upstream release: 2.9.1
-
-* Wed Feb 12 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.0-1
- new upstream release: 2.9.0
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan 09 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.8.3-1
- Update to 2.8.3
- Fix compilation issue with glib >= 2.63.3
- Improved modulemd document validation
- Numerous test enhancements
-
 * Thu Oct 24 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.8.2-1
 - Update to 2.8.2
 - Use safer version of dup()
--- a/modulemd-2.15.2-tests-Adapt-to-glib-2.87.0.patch
+++ b/modulemd-2.15.2-tests-Adapt-to-glib-2.87.0.patch
--- a/plans/sanity.fmf
+++ b/plans/sanity.fmf
@ -1,5 +0,0 @@
-summary: Sanity tests
-discover:
-    how: fmf
-execute:
-    how: tmt
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (modulemd-2.15.2.tar.xz) = d1785f6982ed19292103d741e3e94581e9789737be6f8e90d19218296f3aeb87d6589f3247744f8eab4f714d298d1508312b119624a8c32086c720becfa4cdc5
-SHA512 (modulemd-2.15.2.tar.xz.asc) = 282ff35f15418e95aae09d9bff8084aa0b6f2732cea3934a84a1bd4ddd8e50c8375466acb6a39a6e632f4bbbefd49735b7f56e9304d52521786e245f52feae24
+SHA512 (modulemd-2.8.2.tar.xz) = 281d7550aa1d2d1978454ff8d79d4e94e0f809086e41e8a0bb493a4b488801b5b7cf249fcd648526d7d22bf5deb970a6e93a5095f3318d70f67b968ac9187171
--- a/tests/tests.yml
+++ b/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 python2-libselinux libmodulemd-devel
+  - 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
--- a/tests/upstream-tests.fmf
+++ b/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
--- a/tests/upstream-tests.sh
+++ b/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"