diff --git a/.gitignore b/.gitignore index b7646c5..7287b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /dns-lexicon-2.4.5.tar.gz /dns-lexicon-2.7.0.tar.gz /dns-lexicon-2.7.9.tar.gz +/dns-lexicon-3.0.2.tar.gz diff --git a/0000-remove-shebang.patch b/0000-remove-shebang.patch new file mode 100644 index 0000000..8956bea --- /dev/null +++ b/0000-remove-shebang.patch @@ -0,0 +1,9 @@ +diff --git a/lexicon/cli.py b/lexicon/cli.py +index 9b55b8e..d065039 100644 +--- a/lexicon/cli.py ++++ b/lexicon/cli.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + from __future__ import absolute_import + from __future__ import print_function + diff --git a/0001-fix-requirements.patch b/0001-fix-requirements.patch new file mode 100644 index 0000000..a1a7860 --- /dev/null +++ b/0001-fix-requirements.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index ab653e3..40035eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -81,7 +81,7 @@ setup( + # your project is installed. For an analysis of "install_requires" vs pip's + # requirements files see: + # https://packaging.python.org/en/latest/requirements.html +- install_requires=['requests[security]', 'tldextract', 'future', 'cryptography', 'pyyaml'], ++ install_requires=['requests', 'tldextract', 'future', 'cryptography', 'pyyaml'], + + # Each dependency group in extras_require should match a provider name + # When adding a new depenency group here, please ensure that it has been diff --git a/python-dns-lexicon.spec b/python-dns-lexicon.spec index e92104f..f5e9bcc 100644 --- a/python-dns-lexicon.spec +++ b/python-dns-lexicon.spec @@ -7,7 +7,7 @@ %endif Name: python-%{pypi_name} -Version: 2.7.9 +Version: 3.0.2 Release: 1%{?dist} Summary: Manipulate DNS records on various DNS providers in a standardized/agnostic way @@ -16,19 +16,33 @@ URL: https://github.com/AnalogJ/lexicon Source0: https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -Patch0: remove-shebang.patch +Patch0: 0000-remove-shebang.patch + +%if 0%{?rhel} && 0%{?rhel} <= 7 +Patch1: 0001-fix-requirements.patch +%endif BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python2-cryptography BuildRequires: python2-future +BuildRequires: python2-pyyaml BuildRequires: python2-tldextract +%if 0%{?rhel} && 0%{?rhel} <= 7 +# EL7 has an unversioned name for this packages +BuildRequires: pyOpenSSL +%else +BuildRequires: python2-pyOpenSSL +%endif + %if %{with python3} BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-cryptography BuildRequires: python3-future +BuildRequires: python3-pyOpenSSL +BuildRequires: python3-pyyaml BuildRequires: python3-tldextract %endif @@ -45,8 +59,16 @@ Requires: python2-cryptography Requires: python2-future Requires: python2-requests Requires: python2-setuptools +Requires: python2-pyyaml Requires: python2-tldextract +%if 0%{?rhel} && 0%{?rhel} <= 7 +# EL7 has an unversioned name for this packages +Requires: pyOpenSSL +%else +Requires: python2-pyOpenSSL +%endif + %description -n python2-%{pypi_name} Lexicon provides a way to manipulate DNS records on multiple DNS providers in a standardized way. Lexicon has a CLI but it can also be used as a python @@ -63,6 +85,8 @@ Requires: python3-cryptography Requires: python3-future Requires: python3-requests Requires: python3-setuptools +Requires: python3-pyOpenSSL +Requires: python3-pyyaml Requires: python3-tldextract %description -n python3-%{pypi_name} @@ -118,6 +142,9 @@ ln -s %{_bindir}/lexicon-%{python3_version} %{buildroot}/%{_bindir}/lexicon-3 %endif %changelog +* Wed Nov 14 2018 Eli Young - 3.0.2-1 +- Update to 3.0.2 + * Mon Oct 08 2018 Eli Young - 2.7.9-1 - Update to 2.7.9 (#1637142) diff --git a/remove-shebang.patch b/remove-shebang.patch deleted file mode 100644 index eb5c44d..0000000 --- a/remove-shebang.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/lexicon/__main__.py b/lexicon/__main__.py -index d674809..829e2f6 100644 ---- a/lexicon/__main__.py -+++ b/lexicon/__main__.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - from __future__ import absolute_import - from __future__ import print_function - diff --git a/sources b/sources index cbee783..a1f09f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dns-lexicon-2.7.9.tar.gz) = 84255483938ff6c6fa0d02ea6f11d8b4a3c8261cf9a4e77aff21077e34ea9718c025803e87c9ff61d27d252164d6e4c91936f4fc07a718ff96f424b7e7b17f7e +SHA512 (dns-lexicon-3.0.2.tar.gz) = 0ddf900e63870005ee2aba0cdb009284da502b97aeb62db20cb79b6c6926111f6fbf20d38e3f45a7a1255582ef597c36389676e6167268f60572352fbc0ed35d