Fixes for supporting EPEL 7 builds

Fix the python-six dependency to work with the epel7 naming.

Drop the `Obsoletes: python-modulemd`
The old package is no longer present on Fedora or RHEL 8+ and it
causes issues if libmodulemd tries to remove it on EPEL 7.

Signed-off-by: Stephen Gallagher <[email protected]>

libmodulemd.spec.in

@@ -60,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}
@@ -71,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}