From 2e75d1a77574ac0df8fd4188db8114777daeb4e8 Mon Sep 17 00:00:00 2001 From: Marek Goldmann Date: Feb 13 2019 15:33:05 +0000 Subject: Release 1.7.0 - Update url to fetch source from GitHub - Drop strict version requirements in requirements.txt --- diff --git a/python-pykwalify.spec b/python-pykwalify.spec index 0e727dc..1e181dd 100644 --- a/python-pykwalify.spec +++ b/python-pykwalify.spec @@ -1,29 +1,29 @@ %global pname pykwalify -# Python3 support in OpenStack starts with version 3.5, -# which is only in Fedora 24+ -%if 0%{?fedora} >= 24 +%if 0%{?rhel} +%global default_python 2 +%else %global with_python3 1 %global default_python 3 -%else -%global default_python 2 %endif Name: python-%{pname} -Version: 1.5.1 -Release: 10%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Python lib/cli for JSON/YAML schema validation License: MIT -URL: http://github.com/grokzen/pykwalify -Source0: https://files.pythonhosted.org/packages/source/p/%{pname}/%{pname}-%{version}.tar.gz +URL: https://github.com/grokzen/pykwalify +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel BuildRequires: python2-setuptools +%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools +%endif %description It is a YAML/JSON validation library. @@ -68,6 +68,11 @@ found at: http://www.kuwata-lab.com/kwalify/ %autosetup -n %{pname}-%{version} rm -rf *.egg-info +sed -i "s|^PyYAML.*|PyYAML|g" requirements.txt +sed -i "s|PyYAML.*|PyYAML',|g" setup.py +sed -i "s|^python-dateutil.*|python-dateutil|g" requirements.txt +sed -i "s|python-dateutil.*|python-dateutil',|g" setup.py + %build %py2_build @@ -92,7 +97,7 @@ ln -s %{_bindir}/python2-%{pname} %{buildroot}%{_bindir}/%{pname} %files -n python2-%{pname} -%license docs/License.txt +%license LICENSE %doc README.md %if 0%{?default_python} <= 2 %{_bindir}/%{pname} @@ -103,7 +108,7 @@ ln -s %{_bindir}/python2-%{pname} %{buildroot}%{_bindir}/%{pname} %if 0%{?with_python3} %files -n python3-%{pname} -%license docs/License.txt +%license LICENSE %doc README.md %if 0%{?default_python} >= 3 %{_bindir}/%{pname} @@ -114,6 +119,11 @@ ln -s %{_bindir}/python2-%{pname} %{buildroot}%{_bindir}/%{pname} %endif %changelog +* Wed Feb 13 2019 Marek Goldmann - 1.7.0-1 +- Release 1.7.0 +- Update url to fetch source from GitHub +- Drop strict version requirements in requirements.txt + * Sat Feb 02 2019 Fedora Release Engineering - 1.5.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild