Update python-productmd to 1.10-1

.gitignore

@@ -9,3 +9,4 @@
 /python-productmd-1.7.tar.gz
 /python-productmd-1.8.tar.gz
 /python-productmd-1.9.tar.gz
+/python-productmd-1.10.tar.gz

python-productmd.spec

@@ -1,32 +1,12 @@
 # ** IMPORTANT NOTE **
 # This spec is also tracked in productmd upstream git:
 # https://github.com/release-engineering/productmd
-# Please synchronize changes to it with upstream, and be aware that
+# Please synchronize changes to it with upstream.
-# the spec is used for builds on pure RHEL (i.e. without EPEL packages
-# or macros).
 
-# Enable Python 3 builds for Fedora + EPEL >5
-# NOTE: do **NOT** change 'epel' to 'rhel' here, as this spec is also
-# used to do RHEL builds without EPEL
-%if 0%{?fedora} || 0%{?epel} > 5
-# If the definition isn't available for python3_pkgversion, define it
-%{?!python3_pkgversion:%global python3_pkgversion 3}
 %bcond_without  python3
-%else
-%bcond_with     python3
-%endif
-
-# Compatibility with RHEL. These macros have been added to EPEL but
-# not yet to RHEL proper.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1307190
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}}
-%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}}
 
 Name:           python-productmd
-Version:        1.9
+Version:        1.10
 Release:        1%{?dist}
 Summary:        Library providing parsers for metadata related to OS installation
 
@@ -36,8 +16,16 @@ URL:            https://github.com/release-engineering/productmd
 Source0:        https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
 BuildRequires:  python2-devel
+%if 0%{?epel} < 7
 BuildRequires:  python-setuptools
+%else
+BuildRequires:  python2-setuptools
+%endif
+%if 0%{?fedora}
+BuildRequires:  python2-six
+%else
 BuildRequires:  python-six
+%endif
 
 %if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
@@ -57,7 +45,11 @@ and installation media.
 Summary: %summary
 Obsoletes:      productmd <= %{version}-%{release}
 Provides:       productmd = %{version}-%{release}
+%if 0%{?fedora}
+Requires:       python2-six
+%else
 Requires:       python-six
+%endif
 %{?python_provide:%python_provide python2-productmd}
 
 %description -n python2-productmd %_description
@@ -97,10 +89,6 @@ and installation media.
 %{__python3} ./setup.py test
 %endif
 
-# this must go after all 'License:' tags
-# Implemented in EPEL, but not in RHEL
-%{!?_licensedir:%global license %doc}
-
 %files -n python2-productmd
 %license LICENSE
 %doc AUTHORS
@@ -116,6 +104,14 @@ and installation media.
 %endif
 
 %changelog
+* Wed Jan 17 2018 Lubomír Sedlář <lsedlar@redhat.com> 1.10-1
+- Drop Fedora 25 build (lsedlar@redhat.com)
+- Drop RHEL compatibility from spec (lsedlar@redhat.com)
+- Use more relaxed release type checks (lholecek@redhat.com)
+- Fix parse release id with dash in type (lsedlar@redhat.com)
+- Add tests for parse_release_id() (lholecek@redhat.com)
+- Update dependencies to include Python version (#97)
+
 * Tue Oct 24 2017 Lubomír Sedlář <lsedlar@redhat.com> 1.9-1
 - add updates-testing as a valid compose type (#96)
   (dgilmore@fedoraproject.org)

sources

@@ -1 +1 @@
-SHA512 (python-productmd-1.9.tar.gz) = eaf536b462fed8d1a3403eb73c1d6c8a9cb60742cb7114c5c4ae977803b55290dfac298d942b599e9ec8fe41cd9c9a0b3e51c152392bfffbbaba1c936cddca17
+SHA512 (python-productmd-1.10.tar.gz) = 69ac0cfb353e2b8ae4bca7a4d09f334b998ebb3af5f3186b056868d6315145881ac525b2d5797766a269f67c57ca7b125f8805b58293281febd96b21e46d83ae