Merge branch 'master' into f29

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

libmodulemd1.spec

@@ -40,12 +40,22 @@ Summary: Python 3.6 bindings for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: python%{python3_pkgversion}-gobject-base
 Obsoletes: python3-modulemd < 1.3.4
-Obsoletes: python2-%{name} < 1.8.15-3
 
 %description -n python%{python3_pkgversion}-%{name}
 Python 3 bindings for %{name}
 
 
+%package -n python2-%{name}
+Summary: Python 2 bindings for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python2-gobject-base
+Obsoletes: python2-modulemd < 1.3.4
+Obsoletes: python2-%{name} < 1.8.15-4
+
+%description -n python2-%{name}
+Python 2 bindings for %{name}
+
+
 %package devel
 Summary:        Development files for libmodulemd
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -111,10 +121,16 @@ export MMD_SKIP_VALGRIND=1
 %files -n python%{python3_pkgversion}-%{name}
 
 
+%files -n python2-%{name}
+
+
 %changelog
 * Tue Oct 15 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.8.16-1
 - Improve the merge logic to handle third-party repos more sanely
 
+Mon Aug 05 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.8.15-3.1
+- Restore python2 subpackage on F29 and F30
+
 * Tue Jul 30 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.8.15-3
 - Drop python2 subpackage