From 350ae520c5d1ba8c727f616e66cdfd34036d9f0f Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Jun 25 2020 07:47:02 +0000
Subject: frontend, backend: fix up libmodulemd dependency


This will avoid the need for two-lined *Requires and also ensures that
if the python bindings grow any overrides and additional dependencies
(like the libmodulemd 2.x series has), they will be picked up.

This merges (but affects both Requires/BuildRequires):
https://src.fedoraproject.org/rpms/copr-frontend/pull-request/2
https://src.fedoraproject.org/rpms/copr-backend/pull-request/1

---

diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index abb921f..ef7c826 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -23,8 +23,6 @@ BuildArch:  noarch
 BuildRequires: asciidoc
 BuildRequires: createrepo_c
 BuildRequires: libappstream-glib-builder
-BuildRequires: libmodulemd < 2
-BuildRequires: libmodulemd >= 1.7.0
 BuildRequires: libxslt
 BuildRequires: redis
 BuildRequires: rsync
@@ -41,6 +39,7 @@ BuildRequires: python3-dateutil
 BuildRequires: python3-fedmsg
 BuildRequires: python3-gobject
 BuildRequires: python3-humanize
+BuildRequires: python3-libmodulemd1 >= 1.7.0
 BuildRequires: python3-munch
 BuildRequires: python3-oslo-concurrency
 BuildRequires: python3-packaging
@@ -60,8 +59,6 @@ Requires:   createrepo_c
 Requires:   crontabs
 Requires:   gawk
 Requires:   libappstream-glib-builder
-Requires:   libmodulemd < 2
-Requires:   libmodulemd >= 1.7.0
 Requires:   lighttpd
 Recommends: logrotate
 Requires:   mock
@@ -76,6 +73,7 @@ Requires:   python3-dateutil
 Requires:   python3-fedmsg
 Requires:   python3-gobject
 Requires:   python3-humanize
+Requires:   python3-libmodulemd1 >= 1.7.0
 Requires:   python3-munch
 Requires:   python3-netaddr
 Requires:   python3-novaclient
diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec
index c0c2829..f482a6f 100644
--- a/frontend/copr-frontend.spec
+++ b/frontend/copr-frontend.spec
@@ -69,8 +69,6 @@ BuildRequires: python3-devel
 
 %if %{with check}
 BuildRequires: fedora-messaging
-BuildRequires: libmodulemd < 2
-BuildRequires: libmodulemd >= 1.7.0
 BuildRequires: python3-click
 BuildRequires: python3-CommonMark
 BuildRequires: python3-blinker
@@ -92,6 +90,7 @@ BuildRequires: python3-gobject
 BuildRequires: python3-html2text
 BuildRequires: python3-html5-parser
 BuildRequires: python3-humanize
+BuildRequires: python3-libmodulemd1 >= 1.7.0
 BuildRequires: python3-lxml
 BuildRequires: python3-markdown
 BuildRequires: python3-marshmallow >= 2.0.0
@@ -127,8 +126,6 @@ Requires: fedora-messaging
 Requires: js-html5shiv
 Requires: js-jquery1
 Requires: js-respond
-Requires: libmodulemd < 2
-Requires: libmodulemd >= 1.7.0
 Requires: python3-click
 Requires: python3-CommonMark
 Requires: python3-alembic
@@ -152,6 +149,7 @@ Requires: python3-gobject
 Requires: python3-html2text
 Requires: python3-html5-parser
 Requires: python3-humanize
+Requires: python3-libmodulemd1 >= 1.7.0
 Requires: python3-lxml
 Requires: python3-markdown
 Requires: python3-marshmallow