diff --git a/python-certbot-dns-digitalocean.spec b/python-certbot-dns-digitalocean.spec index 97f26be..93814b9 100644 --- a/python-certbot-dns-digitalocean.spec +++ b/python-certbot-dns-digitalocean.spec @@ -1,17 +1,5 @@ %global pypi_name certbot-dns-digitalocean -%if 0%{?rhel} && 0%{?rhel} <= 7 -%bcond_with python3 -%else -%bcond_without python3 -%endif - -%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 8) -%bcond_with python2 -%else -%bcond_without python2 -%endif - Name: python-%{pypi_name} Version: 1.12.0 Release: 1%{?dist} @@ -29,25 +17,6 @@ Source2: gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg BuildArch: noarch -%if %{with python2} -BuildRequires: python2-acme >= 0.29.0 -BuildRequires: python2-certbot >= 1.1.0 -BuildRequires: python2-devel -BuildRequires: python2-digitalocean >= 1.11 -BuildRequires: python2-mock -BuildRequires: python2-setuptools -BuildRequires: python2-six -BuildRequires: python2-zope-interface - -%if 0%{?rhel} && 0%{?rhel} <= 7 -# EL7 has unversioned names for these packages -BuildRequires: pytest -%else -BuildRequires: python2-pytest -%endif -%endif - -%if %{with python3} BuildRequires: python3-acme >= 0.29.0 BuildRequires: python3-certbot >= 1.1.0 BuildRequires: python3-devel @@ -56,7 +25,6 @@ BuildRequires: python3-pytest BuildRequires: python3-setuptools BuildRequires: python3-six BuildRequires: python3-zope-interface -%endif # Used to verify OpenPGP signature BuildRequires: gnupg2 @@ -66,39 +34,6 @@ This certbot plugin automates the process of completing an ACME dns-01 challenge by creating, and subsequently removing, TXT records using DigitalOcean DNS. -%if %{with python2} -%package -n python2-%{pypi_name} -# Provide the name users expect as a certbot plugin -%if 0%{?rhel} && 0%{?rhel} <= 7 -Provides: %{pypi_name} = %{version}-%{release} -%endif -# Although a plugin for the certbot command it's technically -# an extension to the certbot python libraries -Requires: python2-acme >= 0.29.0 -Requires: python2-certbot >= 1.1.0 -Requires: python2-digitalocean >= 1.11 -Requires: python2-mock -Requires: python2-six -Requires: python2-zope-interface - -%if 0%{?fedora} -#Recommend the CLI as that will be the interface most use -Recommends: certbot >= 0.39.0 -%else -Requires: certbot >= 0.39.0 -%endif -Summary: %{summary} -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -This certbot plugin automates the process of completing an ACME -dns-01 challenge by creating, and subsequently removing, TXT -records using DigitalOcean DNS. - -This is the Python 2 version of the package. -%endif - -%if %{with python3} %package -n python3-%{pypi_name} # Provide the name users expect as a certbot plugin %if 0%{?fedora} @@ -127,7 +62,7 @@ dns-01 challenge by creating, and subsequently removing, TXT records using Google Cloud DNS. This is the Python 3 version of the package. -%endif + %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' @@ -136,44 +71,19 @@ This is the Python 3 version of the package. rm -rf %{pypi_name}.egg-info %build -%if %{with python2} -%py2_build -%endif -%if %{with python3} %py3_build -%endif %check -%if %{with python2} -%{__python2} -m pytest -%endif -%if %{with python3} %{__python3} -m pytest -%endif %install -%if %{with python2} -%py2_install -%endif -%if %{with python3} %py3_install -%endif -%if %{with python2} -%files -n python2-%{pypi_name} -%license LICENSE.txt -%doc README.rst -%{python2_sitelib}/certbot_dns_digitalocean -%{python2_sitelib}/certbot_dns_digitalocean-%{version}*.egg-info -%endif - -%if %{with python3} %files -n python3-%{pypi_name} %license LICENSE.txt %doc README.rst %{python3_sitelib}/certbot_dns_digitalocean %{python3_sitelib}/certbot_dns_digitalocean-%{version}*.egg-info -%endif %changelog * Tue Feb 2 2021 Nick Bebout - 1.12.0-1