From 7501b39cbff834cf9ae1292bc30de66adde4912d Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Fri, 21 Feb 2020 10:58:31 -0500
Subject: [PATCH] spec: Bump libmodulemd version requirement

This matches the latest bump in libdnf:
https://github.com/rpm-software-management/libdnf/commit/763ccc3e33d01efc36a996308d7e5f9728e74f14
---
 ci/installdeps.sh            | 3 ++-
 packaging/rpm-ostree.spec.in | 6 +++---
 tests/vmcheck/install.sh     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ci/installdeps.sh b/ci/installdeps.sh
index 5f02d4c7..08c126e6 100755
--- a/ci/installdeps.sh
+++ b/ci/installdeps.sh
@@ -27,7 +27,8 @@ fi
 pkg_upgrade
 pkg_install_builddeps rpm-ostree
 # and we have the canonical spec file handy so just builddep from that too
-dnf builddep --spec -y packaging/rpm-ostree.spec.in
+# XXX: use --allowerasing as a temporary hack to ease the migration to libmodulemd2
+dnf builddep --spec -y packaging/rpm-ostree.spec.in --allowerasing
 # Mostly dependencies for tests
 pkg_install ostree{,-devel,-grub2} createrepo_c /usr/bin/jq python3-pyyaml \
     libubsan libasan libtsan elfutils fuse sudo python3-gobject-base \
diff --git a/packaging/rpm-ostree.spec.in b/packaging/rpm-ostree.spec.in
index d0da26e5..4ed61765 100644
--- a/packaging/rpm-ostree.spec.in
+++ b/packaging/rpm-ostree.spec.in
@@ -76,9 +76,9 @@ BuildRequires: gcc-c++
 
 # more libdnf build deps (see libdnf's spec for versions)
 %global swig_version 3.0.12
-%global libmodulemd_version 1.6.1
+%global libmodulemd_version 2.5.0
 BuildRequires:  swig >= %{swig_version}
-BuildRequires:  pkgconfig(modulemd) >= %{libmodulemd_version}
+BuildRequires:  pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
 BuildRequires:  pkgconfig(json-c)
 BuildRequires:  pkgconfig(cppunit)
 BuildRequires:  pkgconfig(sqlite3)
@@ -88,7 +88,7 @@ BuildRequires:  pkgconfig(zck) >= 0.9.11
 %endif
 BuildRequires:  gpgme-devel
 
-Requires:       libmodulemd1%{?_isa} >= %{libmodulemd_version}
+Requires:       libmodulemd%{?_isa} >= %{libmodulemd_version}
 
 # For now...see https://github.com/projectatomic/rpm-ostree/pull/637
 # and https://github.com/fedora-infra/fedmsg-atomic-composer/pull/17
diff --git a/tests/vmcheck/install.sh b/tests/vmcheck/install.sh
index 592124bd..6bf308e1 100755
--- a/tests/vmcheck/install.sh
+++ b/tests/vmcheck/install.sh
@@ -20,7 +20,7 @@ ostree --version
 # in important ways.
 # XXX: We add libmodulemd manually for now until it's
 # part of the image.
-pkgs="libsolv libmodulemd1"
+pkgs="libsolv libmodulemd"
 if rpm -q zchunk-libs 2>/dev/null; then
     pkgs="${pkgs} zchunk-libs"
 fi