From 30ae62e232c4f4d7c87a46d5abacd838b9b3ecb5 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Mar 11 2020 20:37:28 +0000
Subject: [packit] 2.9.2 upstream release


Upstream tag: libmodulemd-2.9.2
Upstream commit: 780750ea

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

---

diff --git a/.gitignore b/.gitignore
index 19b06bc..f709060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
 /modulemd-2.8.3.tar.xz
 /modulemd-2.9.0.tar.xz
 /modulemd-2.9.1.tar.xz
+/modulemd-2.9.2.tar.xz
diff --git a/.packit.yml b/.packit.yml
index 7514322..f445248 100644
--- a/.packit.yml
+++ b/.packit.yml
@@ -17,7 +17,9 @@ jobs:
 - job: copr_build
   trigger: pull_request
   metadata:
-    targets: fedora-all
+    targets:
+    - fedora-all
+    - epel-7
 
 - job: propose_downstream
   trigger: release
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 967055a..c0da9c6 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -7,14 +7,20 @@
   %global build_python2 0
 %endif
 
-Name:           libmodulemd
-Version:        2.9.1
-Release:        1%{?dist}
+%global upstream_name libmodulemd
+
+%if (0%{?rhel} && 0%{?rhel} <= 7)
+  %global v2_suffix 2
+%endif
+
+Name:           %{upstream_name}%{?v2_suffix}
+Version:        2.9.2
+Release:        0.20200311.1gitg31bbd4e%{?dist}
 Summary:        Module metadata manipulation library
 
 License:        MIT
 URL:            https://github.com/fedora-modularity/libmodulemd
-Source0:        %{url}/releases/download/%{name}-%{version}/modulemd-%{version}.tar.xz
+Source0:        %{url}/releases/download/%{upstream_name}-%{version}/modulemd-%{version}.tar.xz
 
 BuildRequires:  meson >= 0.47
 BuildRequires:  pkgconfig
@@ -31,13 +37,14 @@ BuildRequires:  file-devel
 BuildRequires:  python2-devel
 BuildRequires:  python-gobject-base
 %endif
-BuildRequires:  python3-devel
-BuildRequires:  python3-gobject-base
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-gobject-base
 %ifarch %{valgrind_arches}
 BuildRequires:  valgrind
 %endif
 BuildRequires:  help2man
 
+
 # Patches
 
 
@@ -53,7 +60,6 @@ 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}
@@ -64,8 +70,13 @@ Python 2 bindings for %{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}
-Obsoletes: python%{python3_pkgversion}-modulemd < 1.3.4
+%endif
 
 %description -n python%{python3_pkgversion}-%{name}
 Python %{python3_pkgversion} bindings for %{name}
@@ -74,6 +85,10 @@ Python %{python3_pkgversion} 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
@@ -120,7 +135,10 @@ export MMD_SKIP_VALGRIND=1
 # Don't conflict with modulemd-validator from 1.x included in the official
 # RHEL 7 repos
 mv %{buildroot}%{_bindir}/modulemd-validator \
-   %{buildroot}%{_bindir}/modulemd-validator2
+   %{buildroot}%{_bindir}/modulemd-validator%{?v2_suffix}
+
+mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
+   %{buildroot}%{_mandir}/man1/modulemd-validator%{?v2_suffix}.1
 %endif
 
 
@@ -130,19 +148,15 @@ mv %{buildroot}%{_bindir}/modulemd-validator \
 %files
 %license COPYING
 %doc README.md
-%if ( 0%{?rhel} && 0%{?rhel} <= 7)
-%{_bindir}/modulemd-validator2
-%else
-%{_bindir}/modulemd-validator
-%endif
-%{_mandir}/man1/modulemd-validator.1*
-%{_libdir}/%{name}.so.2*
+%{_bindir}/modulemd-validator%{?v2_suffix}
+%{_mandir}/man1/modulemd-validator%{?v2_suffix}.1*
+%{_libdir}/%{upstream_name}.so.2*
 %dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/Modulemd-2.0.typelib
 
 
 %files devel
-%{_libdir}/%{name}.so
+%{_libdir}/%{upstream_name}.so
 %{_libdir}/pkgconfig/modulemd-2.0.pc
 %{_includedir}/modulemd-2.0/
 %dir %{_datadir}/gir-1.0
@@ -163,6 +177,9 @@ mv %{buildroot}%{_bindir}/modulemd-validator \
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index ff18530..6c76530 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-2.9.1.tar.xz) = 9f32bcea4f020edc4bc3de747c4cd588efc80a28922b075185907289bfd88d7436717908594b0709c04ae5dc578b0097591c7fb0f61acad32f4f56e74b3bc375
+SHA512 (modulemd-2.9.2.tar.xz) = 7605f5d0f90a4af0ca2b40a90a5701c71d5ee4c4e276433f440670102100809b2d026c8c676f11adf2b0d50201df5caf326e464b6f4f3c139cb62bc711f3ee28