From 4a50ee1243bfcf5e0e1a2755f9c200f1e49cfbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 4 Apr 2017 10:44:18 +0200 Subject: [PATCH 1/6] Update python-productmd to 1.5-1 --- .gitignore | 1 + python-productmd.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ed2f83b..4f469ad 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /productmd-1.2.tar.bz2 /python-productmd-1.3.tar.gz /python-productmd-1.4.tar.gz +/python-productmd-1.5.tar.gz diff --git a/python-productmd.spec b/python-productmd.spec index 949bf94..52934cf 100644 --- a/python-productmd.spec +++ b/python-productmd.spec @@ -26,8 +26,8 @@ %{!?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.4 -Release: 3%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Library providing parsers for metadata related to OS installation Group: Development/Tools @@ -111,6 +111,15 @@ and installation media. %endif %changelog +* Tue Apr 04 2017 Lubomír Sedlář 1.5-1 +- Add 'unified' to unique image attributes (lsedlar@redhat.com) +- Add EA - Early Access label (lkocman@redhat.com) +- Correctly parse type from ci compose (lsedlar@redhat.com) +- Simplify tests for creating compose id (lsedlar@redhat.com) +- Sync spec file with Fedora (enable Py3 for EPEL) (#79) (awilliam@redhat.com) +- Support 'unique image identifier' concept, enforce on 1.1+ + (awilliam@redhat.com) + * Wed Feb 15 2017 Adam Williamson - Restore compatibility cruft for pure-RHEL builds diff --git a/sources b/sources index c50b383..4fa7998 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-productmd-1.4.tar.gz) = c0a211ea33430952cb83338638da5ff515d5c176b18ecbe46b490873aa76b61f8702015fac5d511c90121c763723147156236ca4e70f58972698c5f12a03d629 +SHA512 (python-productmd-1.5.tar.gz) = 43cc62290ace8eebb3bf3120f12dbb0aa248bb9ea24e58e59f8ce6948833ca3bd338d864cf71343b46630b8b704df1706e9d5b894e62c2830c04f9fe8a6c62ea From d1ebbce86346ccea054376a3f478947a37113dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 6 Apr 2017 09:05:16 +0200 Subject: [PATCH 2/6] Update python-productmd to 1.6-1 --- .gitignore | 1 + python-productmd.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4f469ad..0065acf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /python-productmd-1.3.tar.gz /python-productmd-1.4.tar.gz /python-productmd-1.5.tar.gz +/python-productmd-1.6.tar.gz diff --git a/python-productmd.spec b/python-productmd.spec index 52934cf..bfc4e9f 100644 --- a/python-productmd.spec +++ b/python-productmd.spec @@ -26,7 +26,7 @@ %{!?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.5 +Version: 1.6 Release: 1%{?dist} Summary: Library providing parsers for metadata related to OS installation @@ -111,6 +111,10 @@ and installation media. %endif %changelog +* Thu Apr 06 2017 Lubomír Sedlář 1.6-1 +- Add a new image type dvd-debuginfo (lsedlar@redhat.com) +- Add Tito release for F26 (lsedlar@redhat.com) + * Tue Apr 04 2017 Lubomír Sedlář 1.5-1 - Add 'unified' to unique image attributes (lsedlar@redhat.com) - Add EA - Early Access label (lkocman@redhat.com) diff --git a/sources b/sources index 4fa7998..c90776e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-productmd-1.5.tar.gz) = 43cc62290ace8eebb3bf3120f12dbb0aa248bb9ea24e58e59f8ce6948833ca3bd338d864cf71343b46630b8b704df1706e9d5b894e62c2830c04f9fe8a6c62ea +SHA512 (python-productmd-1.6.tar.gz) = c1ef3867cc35bf06ee78aa866aacfa6f961bcf7818b96f0a7ee5b65872db22d52eb3133b5144d369b7507e56327e8f81a0d47f07e061dfd948b3c1b5e52bdf41 From c2e71a2db64a121efd2ca557f40cd374344733ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 19 Apr 2017 15:08:27 +0200 Subject: [PATCH 3/6] Update python-productmd to 1.7-1 --- .gitignore | 1 + python-productmd.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0065acf..3fb12e7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /python-productmd-1.4.tar.gz /python-productmd-1.5.tar.gz /python-productmd-1.6.tar.gz +/python-productmd-1.7.tar.gz diff --git a/python-productmd.spec b/python-productmd.spec index bfc4e9f..060dc43 100644 --- a/python-productmd.spec +++ b/python-productmd.spec @@ -26,7 +26,7 @@ %{!?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.6 +Version: 1.7 Release: 1%{?dist} Summary: Library providing parsers for metadata related to OS installation @@ -111,6 +111,9 @@ and installation media. %endif %changelog +* Wed Apr 19 2017 Lubomír Sedlář 1.7-1 +- common: omit context kwarg to urlopen on old Python (lsedlar@redhat.com) + * Thu Apr 06 2017 Lubomír Sedlář 1.6-1 - Add a new image type dvd-debuginfo (lsedlar@redhat.com) - Add Tito release for F26 (lsedlar@redhat.com) diff --git a/sources b/sources index c90776e..fe9c2df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-productmd-1.6.tar.gz) = c1ef3867cc35bf06ee78aa866aacfa6f961bcf7818b96f0a7ee5b65872db22d52eb3133b5144d369b7507e56327e8f81a0d47f07e061dfd948b3c1b5e52bdf41 +SHA512 (python-productmd-1.7.tar.gz) = 90ec0de1ff01c09d9496c849f7f603383bcf9d226d869602e7a379ad9fac54317316e4ad28cc8f6ae424bf74c9d1a61b4592a49961ae7fb26a954d67888b6dc2 From dceaa1a0a5878742011946870a27fcbc41d07645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 11 Oct 2017 12:11:03 +0200 Subject: [PATCH 4/6] Update python-productmd to 1.8-1 --- .gitignore | 1 + python-productmd.spec | 37 +++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 3fb12e7..28f308b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /python-productmd-1.5.tar.gz /python-productmd-1.6.tar.gz /python-productmd-1.7.tar.gz +/python-productmd-1.8.tar.gz diff --git a/python-productmd.spec b/python-productmd.spec index 060dc43..d9a433a 100644 --- a/python-productmd.spec +++ b/python-productmd.spec @@ -26,7 +26,7 @@ %{!?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.7 +Version: 1.8 Release: 1%{?dist} Summary: Library providing parsers for metadata related to OS installation @@ -35,12 +35,6 @@ License: LGPLv2+ URL: https://github.com/release-engineering/productmd Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz -Obsoletes: productmd <= %{version}-%{release} -Provides: productmd = %{version}-%{release} -Provides: python2-productmd = %{version}-%{release} - -Requires: python-six - BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-six @@ -53,10 +47,21 @@ BuildRequires: python%{python3_pkgversion}-six BuildArch: noarch -%description -Python library providing parsers for metadata related to composes +%global _description\ +Python library providing parsers for metadata related to composes\ and installation media. +%description %_description + +%package -n python2-productmd +Summary: %summary +Obsoletes: productmd <= %{version}-%{release} +Provides: productmd = %{version}-%{release} +Requires: python-six +%{?python_provide:%python_provide python2-productmd} + +%description -n python2-productmd %_description + %if 0%{?with_python3} %package -n python%{python3_pkgversion}-productmd Summary: Library providing parsers for metadata related to OS installation @@ -96,7 +101,7 @@ and installation media. # Implemented in EPEL, but not in RHEL %{!?_licensedir:%global license %doc} -%files +%files -n python2-productmd %license LICENSE %doc AUTHORS %{python_sitelib}/productmd/ @@ -111,6 +116,18 @@ and installation media. %endif %changelog +* Wed Oct 11 2017 Lubomír Sedlář 1.8-1 +- Report better error on parsing invalid JSON (#95) (lubomir.sedlar@gmail.com) +- Python 2 binary package renamed to python2-productmd (zbyszek@in.waw.pl) +- Sync spec file with Fedora (#94) (lubomir.sedlar@gmail.com) + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7-3 +- Python 2 binary package renamed to python2-productmd + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Jul 27 2017 Fedora Release Engineering - 1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Apr 19 2017 Lubomír Sedlář 1.7-1 - common: omit context kwarg to urlopen on old Python (lsedlar@redhat.com) diff --git a/sources b/sources index fe9c2df..8106d4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-productmd-1.7.tar.gz) = 90ec0de1ff01c09d9496c849f7f603383bcf9d226d869602e7a379ad9fac54317316e4ad28cc8f6ae424bf74c9d1a61b4592a49961ae7fb26a954d67888b6dc2 +SHA512 (python-productmd-1.8.tar.gz) = 0a9c38a2412d0d02463f5b97c60504de5802e7ae6c186f785a943ea0b491ce3f1efd392213ae1e7d7c0fc0e6734bc65e0e47ca7c8539f2201b3aabbf8e6570d5 From 498a5a0c9cf9683e8f2a6f26a6fc8cab85a0a288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 24 Oct 2017 07:58:13 +0200 Subject: [PATCH 5/6] Update python-productmd to 1.9-1 --- .gitignore | 1 + python-productmd.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 28f308b..a0343d5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /python-productmd-1.6.tar.gz /python-productmd-1.7.tar.gz /python-productmd-1.8.tar.gz +/python-productmd-1.9.tar.gz diff --git a/python-productmd.spec b/python-productmd.spec index d9a433a..be345e5 100644 --- a/python-productmd.spec +++ b/python-productmd.spec @@ -26,7 +26,7 @@ %{!?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.8 +Version: 1.9 Release: 1%{?dist} Summary: Library providing parsers for metadata related to OS installation @@ -116,6 +116,11 @@ and installation media. %endif %changelog +* Tue Oct 24 2017 Lubomír Sedlář 1.9-1 +- add updates-testing as a valid compose type (#96) + (dgilmore@fedoraproject.org) +- Update tito configuration (lsedlar@redhat.com) + * Wed Oct 11 2017 Lubomír Sedlář 1.8-1 - Report better error on parsing invalid JSON (#95) (lubomir.sedlar@gmail.com) - Python 2 binary package renamed to python2-productmd (zbyszek@in.waw.pl) diff --git a/sources b/sources index 8106d4f..66861d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-productmd-1.8.tar.gz) = 0a9c38a2412d0d02463f5b97c60504de5802e7ae6c186f785a943ea0b491ce3f1efd392213ae1e7d7c0fc0e6734bc65e0e47ca7c8539f2201b3aabbf8e6570d5 +SHA512 (python-productmd-1.9.tar.gz) = eaf536b462fed8d1a3403eb73c1d6c8a9cb60742cb7114c5c4ae977803b55290dfac298d942b599e9ec8fe41cd9c9a0b3e51c152392bfffbbaba1c936cddca17 From 45520aa565de440c06b732765a15068fddb10056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 17 Jan 2018 10:29:04 +0100 Subject: [PATCH 6/6] Update python-productmd to 1.10-1 --- .gitignore | 1 + python-productmd.spec | 48 ++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index a0343d5..95beb34 100644 --- a/.gitignore +++ b/.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 diff --git a/python-productmd.spec b/python-productmd.spec index be345e5..5b16337 100644 --- a/python-productmd.spec +++ b/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 -# the spec is used for builds on pure RHEL (i.e. without EPEL packages -# or macros). +# Please synchronize changes to it with upstream. -# 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ář 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ář 1.9-1 - add updates-testing as a valid compose type (#96) (dgilmore@fedoraproject.org) diff --git a/sources b/sources index 66861d7..70bb91c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-productmd-1.9.tar.gz) = eaf536b462fed8d1a3403eb73c1d6c8a9cb60742cb7114c5c4ae977803b55290dfac298d942b599e9ec8fe41cd9c9a0b3e51c152392bfffbbaba1c936cddca17 +SHA512 (python-productmd-1.10.tar.gz) = 69ac0cfb353e2b8ae4bca7a4d09f334b998ebb3af5f3186b056868d6315145881ac525b2d5797766a269f67c57ca7b125f8805b58293281febd96b21e46d83ae