From 052465943854ca987af48d36c1c3f77b506e4e2b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 7 Feb 2018 12:47:42 +0100 Subject: [PATCH] packaging fixes https://github.com/release-engineering/productmd/pull/103 Signed-off-by: Igor Gnatenko --- python-productmd.spec | 47 +++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/python-productmd.spec b/python-productmd.spec index 7b1b066..52abd79 100644 --- a/python-productmd.spec +++ b/python-productmd.spec @@ -7,32 +7,13 @@ Name: python-productmd Version: 1.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library providing parsers for metadata related to OS installation -Group: Development/Tools License: LGPLv2+ 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 -BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-six -%endif - BuildArch: noarch %global _description\ @@ -45,10 +26,15 @@ and installation media. Summary: %summary Obsoletes: productmd <= %{version}-%{release} Provides: productmd = %{version}-%{release} -%if 0%{?fedora} -Requires: python2-six -%else +BuildRequires: python2-devel +%if 0%{?rhel} && 0%{?rhel} <= 7 +BuildRequires: python-setuptools +BuildRequires: python-six Requires: python-six +%else +BuildRequires: python2-setuptools +BuildRequires: python2-six +Requires: python2-six %endif %{?python_provide:%python_provide python2-productmd} @@ -56,13 +42,13 @@ Requires: python-six %if 0%{?with_python3} %package -n python%{python3_pkgversion}-productmd -Summary: Library providing parsers for metadata related to OS installation -Group: Development/Tools -Requires: python%{python3_pkgversion}-six +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}-productmd -Python library providing parsers for metadata related to composes -and installation media. +%description -n python%{python3_pkgversion}-productmd %_description %endif %prep @@ -102,6 +88,9 @@ and installation media. %endif %changelog +* Wed Feb 07 2018 Igor Gnatenko - 1.10-3 +- packaging fixes + * Fri Jan 19 2018 Lubomír Sedlář - 1.10-2 - Fix wrong python_sitelib macro (RHBZ#1536202)