.gitignore

@@ -1,33 +1,2 @@
-/productmd-1.0.tar.bz2
+SOURCES/python-productmd-1.11.tar.gz
-/productmd-1.0.tar.gz
-/productmd-1.1.tar.gz
-/productmd-1.2.tar.bz2
-/python-productmd-1.3.tar.gz
-/python-productmd-1.4.tar.gz
-/python-productmd-1.5.tar.gz
-/python-productmd-1.6.tar.gz
-/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-1.11.tar.gz
-/productmd-1.12.tar.bz2
-/productmd-1.13.tar.bz2
-/productmd-1.14.tar.bz2
-/productmd-1.15.tar.bz2
-/productmd-1.16.tar.bz2
-/productmd-1.17.tar.bz2
-/productmd-1.18.tar.bz2
-/productmd-1.19.tar.bz2
-/productmd-1.20.tar.bz2
-/productmd-1.21.tar.bz2
-/productmd-1.22.tar.bz2
-/productmd-1.23.tar.bz2
-/productmd-1.24.tar.bz2
-/productmd-1.25.tar.bz2
-/productmd-1.26.tar.bz2
-/productmd-1.27.tar.gz
-/productmd-1.28.tar.gz
-/productmd-1.29.tar.gz
-/productmd-1.30.tar.gz
-/productmd-1.31.tar.gz

139.patch

@@ -1,75 +0,0 @@
-From b091abdc917c2eca544e5928b85b2bb9270912b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Thu, 31 Oct 2019 14:25:18 +0100
-Subject: [PATCH] Make tests pass on Python 2.6
-
----
- tests/test_extra_files.py | 43 ++++++++++++++++++++++++++++++---------
- 1 file changed, 33 insertions(+), 10 deletions(-)
-
-diff --git a/tests/test_extra_files.py b/tests/test_extra_files.py
-index 54115e9..7848fd9 100755
---- a/tests/test_extra_files.py
-+++ b/tests/test_extra_files.py
-@@ -63,28 +63,51 @@ def _test_identity(self, modules):
- 
-     def test_bad_checksums(self):
-         metadata = ExtraFiles()
--        with self.assertRaises(TypeError):
--            metadata.add("Everything", "x86_64", "path/to/file", size=1, checksums="no")
-+        self.assertRaises(
-+            TypeError,
-+            metadata.add,
-+            "Everything",
-+            "x86_64",
-+            "path/to/file",
-+            size=1,
-+            checksums="no",
-+        )
- 
-     def test_bad_variant(self):
-         metadata = ExtraFiles()
--        with self.assertRaises(ValueError):
--            metadata.add("", "x86_64", "path/to/file", size=1, checksums={})
-+        self.assertRaises(
-+            ValueError, metadata.add, "", "x86_64", "path/to/file", size=1, checksums={}
-+        )
- 
-     def test_bad_arch(self):
-         metadata = ExtraFiles()
--        with self.assertRaises(ValueError):
--            metadata.add("Everything", "foobar", "path/to/file", size=1, checksums={})
-+        self.assertRaises(
-+            ValueError,
-+            metadata.add,
-+            "Everything",
-+            "foobar",
-+            "path/to/file",
-+            size=1,
-+            checksums={},
-+        )
- 
-     def test_bad_path(self):
-         metadata = ExtraFiles()
--        with self.assertRaises(ValueError):
--            metadata.add("Everything", "foobar", "", size=1, checksums={})
-+        self.assertRaises(
-+            ValueError, metadata.add, "Everything", "foobar", "", size=1, checksums={}
-+        )
- 
-     def test_absolute_path(self):
-         metadata = ExtraFiles()
--        with self.assertRaises(ValueError):
--            metadata.add("Everything", "foobar", "/path", size=1, checksums={})
-+        self.assertRaises(
-+            ValueError,
-+            metadata.add,
-+            "Everything",
-+            "foobar",
-+            "/path",
-+            size=1,
-+            checksums={},
-+        )
- 
-     def test_fedora_20(self):
-         metadata = ExtraFiles()

python-productmd.spec

@@ -1,31 +1,31 @@
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%bcond_without python2
-%else
-%bcond_with python2
-%endif
 %bcond_without  python3
 
-%global srcname productmd
+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
 
-Name:           python-%{srcname}
+Name:           python-productmd
-Version:        1.31
+Version:        1.11
 Release:        3%{?dist}
 Summary:        Library providing parsers for metadata related to OS installation
 
 License:        LGPLv2+
 URL:            https://github.com/release-engineering/productmd
-Source0:        https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
-%global _description \
+%global _description\
 Python library providing parsers for metadata related to composes\
 and installation media.
 
 %description %_description
 
-%if 0%{?with_python2}
+%if %{with python2}
-%package -n python2-%{srcname}
+%package -n python2-productmd
 Summary:        %summary
 Obsoletes:      productmd <= %{version}-%{release}
 Provides:       productmd = %{version}-%{release}
@@ -39,194 +39,71 @@ BuildRequires:  python2-setuptools
 BuildRequires:  python2-six
 Requires:       python2-six
 %endif
-%{?python_provide:%python_provide python2-%{srcname}}
+%{?python_provide:%python_provide python2-productmd}
 
-%description -n python2-%{srcname} %_description
+%description -n python2-productmd %_description
-%endif
+%endif # with python2
 
 %if 0%{?with_python3}
-%package -n python%{python3_pkgversion}-%{srcname}
+%package -n python%{python3_pkgversion}-productmd
 Summary:        %{summary}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-six
 Requires:       python%{python3_pkgversion}-six
 
-%description -n python%{python3_pkgversion}-%{srcname} %_description
+%description -n python%{python3_pkgversion}-productmd %_description
 %endif
 
 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%setup -q
 
 %build
-%if 0%{?with_python2}
+%if %{with python2}
 %py2_build
-%endif
+%endif # with python2
 
 %if 0%{?with_python3}
 %py3_build
 %endif
 
 %install
-%if 0%{?with_python2}
+%if %{with python2}
 %py2_install
-%endif
+%endif # with python2
 
 %if 0%{?with_python3}
 %py3_install
 %endif
 
 %check
-%if 0%{?with_python2}
+%if %{with python2}
 %{__python2} ./setup.py test
-%endif
+%endif # with python2
 
 %if 0%{?with_python3}
 %{__python3} ./setup.py test
 %endif
 
-%if 0%{?with_python2}
+%if %{with python2}
-%files -n python2-%{srcname}
+%files -n python2-productmd
 %license LICENSE
 %doc AUTHORS
 %{python2_sitelib}/productmd/
 %{python2_sitelib}/productmd-%{version}-py?.?.egg-info
-%endif
+%endif # with python2
 
 %if 0%{?with_python3}
-%files -n python%{python3_pkgversion}-%{srcname}
+%files -n python%{python3_pkgversion}-productmd
 %license LICENSE
 %doc AUTHORS
 %{python3_sitelib}/productmd/
-%{python3_sitelib}/productmd-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/productmd-%{version}-py?.?.egg-info
 %endif
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.31-3
+* Tue Jun 05 2018 Charalampos Stratakis <cstratak@redhat.com> - 1.11-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Conditionalize the python2 subpackage
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.31-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Feb 08 2021 Lubomír Sedlář <lsedlar@redhat.com> - 1.31-1
-- New upstream release
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Nov 26 2020 Lubomír Sedlář <lsedlar@redhat.com> - 1.30-1
-- New upstream release
-
-* Tue Nov 10 2020 Lubomír Sedlář <lsedlar@redhat.com> - 1.29-1
-- New upstream release
-
-* Tue Sep 29 2020 Lubomír Sedlář <lsedlar@redhat.com> - 1.28-2
-- Fix Python 2 conditional for ELN
-
-* Fri Sep 25 2020 Lubomír Sedlář <lsedlar@redhat.com> - 1.28-1
-- New upstream release
-
-* Wed Aug 19 2020 Lubomír Sedlář <lsedlar@redhat.com> - 1.27-1
-- New upstream release 1.27
-- Switch sources to tar.gz
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 1.26-2
-- Rebuilt for Python 3.9
-
-* Thu Apr 09 2020 Lubomír Sedlář <lsedlar@redhat.com> - 1.26-1
-- New upstream release 1.26
-
-* Mon Mar 23 2020 Lubomír Sedlář <lsedlar@redhat.com> - 1.25-1
-- New upstream release 1.25
-
-* Fri Feb 07 2020 Lubomír Sedlář <lsedlar@redhat.com> - 1.24-1
-- New upstream release 1.24
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Nov 01 2019 Lubomír Sedlář <lsedlar@redhat.com> - 1.23-1
-- Add class for representing extra files in the compose (lsedlar@redhat.com)
-- Add tests for multiple variants in one .treeinfo (riehecky@fnal.gov)
-
-* Wed Sep 04 2019 Lubomír Sedlář <lsedlar@redhat.com> - 1.22-1
-- Fix parsing composeinfo with almost conflicting UIDs (lsedlar@redhat.com)
-- Improve error message for invalid metadata (lsedlar@redhat.com)
-- Fix image format for vpc (lsedlar@redhat.com)
-- Set up test infrastructure (lsedlar@redhat.com)
-- Add missing parts to the TreeInfo documentation (jkonecny@redhat.com)
-- Add a comment explaining the 'tar-gz' type (awilliam@redhat.com)
-
-* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 1.21-3
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Mar 11 2019 Lubomír Sedlář <lsedlar@redhat.com> - 1.21-1
-- Include typo fix from upstream
-
-* Sat Mar 09 2019 Kevin Fenzi <kevin@scrye.com> - 1.20-3
-- Fix typo in image names: s/vabrant/vagrant/ (Rawhide)
-- Rebuilt to change main python from 3.4 to 3.6 (EPEL 7)
-
-* Thu Mar 07 2019 Lubomír Sedlář <lsedlar@redhat.com> - 1.20-2
-- Disable python 2 subpackage on F>=31
-
-* Tue Mar 05 2019 Lubomír Sedlář <lsedlar@redhat.com> - 1.20-1
-- Improve getting sync between image types and formats
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 24 2019 Lubomír Sedlář <lsedlar@redhat.com> - 1.19-1
-- Fix get_minor_version on inputs with more that two components
-- Add new release types
-- Add __version__ attribute
-- Documentation improvements
-
-* Fri Nov 23 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.18-1
-- Add SecurityFix label
-- Fix get_major_version on inputs with more than two components
-
-* Fri Oct 05 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.17-1
-- Do not use custom repr for objects with no compose
-- Add additional_variants attribute to unified images
-
-* Tue Aug 14 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.16-1
-- Allow module metadata with empty modules
-
-* Fri Jul 20 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.15-4
-- Use python2_sitelib instead of python_sitelib
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 22 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.15-2
-- Rebuilt for Python 3.7
-
-* Wed Jun 20 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.15-1
-- Add missing _modules attribute to Compose
-- composeinfo: add docs for Compose class
-- rpms: add doc example for using the Rpms class
-- common: document parse_nvra() return value elements
-- common: explain filename handling for parse_nvra()
-
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1.14-2
-- Rebuilt for Python 3.7
-
-* Fri May 11 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.14-1
-- Add rhevm-ova as valid type
-
-* Thu May 10 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.13-1
-- Add vsphere-ova as valid image type
-
-* Mon May 07 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.12-1
-- Add vpc/vhd as known image type/format
 
 * Wed Apr 04 2018 Lubomír Sedlář <lsedlar@redhat.com> - 1.11-2
 - Stop using Tito from upstream

sources

@@ -1 +1 @@
-SHA512 (productmd-1.31.tar.gz) = e4ca1eeace1bef5ef242efe25ffc96017ba6f7cc9fb461f401e4a0f8029c96a7b3660183a82cd552a86e3000fb2afb9f150cfd889e879275b3e77ebb5d155e82
+SHA512 (python-productmd-1.11.tar.gz) = f6dbf31c1d13f105a8d8d2289d773431ece6b8719c69d8e30efebc25b5e97e996f4cce6d8394a83b9180ec77335234a08d826767c6dbee6d6449318149b0576e