From b251cf7e50c59c2358992d2c7fdc74689ed43685 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Feb 26 2018 16:23:15 +0000 Subject: Backport patch to fix dep in epel7 --- diff --git a/allow-old-setuptools.patch b/allow-old-setuptools.patch new file mode 100644 index 0000000..b9beb93 --- /dev/null +++ b/allow-old-setuptools.patch @@ -0,0 +1,13 @@ +--- certbot-dns-luadns-0.21.1-orig/setup.py 2018-01-25 13:29:45.000000000 -0600 ++++ certbot-dns-luadns-0.21.1/setup.py 2018-02-26 10:22:05.623818997 -0600 +@@ -12,9 +12,7 @@ + 'certbot=={0}'.format(version), + 'dns-lexicon', + 'mock', +- # For pkg_resources. >=1.0 so pip resolves it to a version cryptography +- # will tolerate; see #2599: +- 'setuptools>=1.0', ++ 'setuptools', + 'zope.interface', + ] + diff --git a/python-certbot-dns-luadns.spec b/python-certbot-dns-luadns.spec index cd8c4bc..363953c 100644 --- a/python-certbot-dns-luadns.spec +++ b/python-certbot-dns-luadns.spec @@ -9,19 +9,23 @@ Name: python-%{pypi_name} Version: 0.21.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: LuaDNS Authenticator plugin for Certbot License: ASL 2.0 URL: https://github.com/certbot/certbot Source0: https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch - + +%if 0%{?rhel} && 0%{?rhel} <= 7 +Patch0: allow-old-setuptools.patch +%endif + BuildRequires: python2-certbot = 0.21.1 BuildRequires: python2-devel BuildRequires: python2-dns-lexicon BuildRequires: python2-setuptools -BuildRequires: python-zope-interface +BuildRequires: python2-zope-interface %if %{with python3} BuildRequires: python2-sphinx @@ -101,8 +105,9 @@ rm -rf html/.{doctrees,buildinfo} %check -%if %{with python3} %{__python2} setup.py test + +%if %{with python3} %{__python3} setup.py test %endif @@ -124,5 +129,8 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog -* Wed Feb 21 2018 Nick Bebout - 0.21.1-1 +* Mon Feb 26 2018 Nick Bebout - 0.21.1-2 +- Add patch to remove no longer needed versioned dep in epel7 + +* Wed Feb 21 2018 Nick Bebout - 0.21.1-1 - Initial package.