diff --git a/.gitignore b/.gitignore index 40d32d1..aa62501 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,2 @@ -/certbot-nginx-0.14.1.tar.gz -/certbot-nginx-0.18.1.tar.gz -/certbot-nginx-0.18.2.tar.gz -/certbot-nginx-0.19.0.tar.gz -/certbot-nginx-0.20.0.tar.gz -/certbot-nginx-0.21.1.tar.gz -/certbot-nginx-0.22.0.tar.gz -/certbot-nginx-0.22.2.tar.gz -/certbot-nginx-0.23.0.tar.gz -/certbot-nginx-0.24.0.tar.gz -/certbot-nginx-0.25.0.tar.gz -/certbot-nginx-0.25.1.tar.gz -/certbot-nginx-0.26.0.tar.gz -/certbot-nginx-0.26.1.tar.gz -/certbot-nginx-0.27.1.tar.gz -/certbot-nginx-0.28.0.tar.gz -/certbot-nginx-0.29.1.tar.gz -/certbot-nginx-0.30.2.tar.gz -/certbot-nginx-0.31.0.tar.gz -/certbot-nginx-0.34.2.tar.gz -/certbot-nginx-0.35.1.tar.gz -/certbot-nginx-0.36.0.tar.gz -/certbot-nginx-0.37.2.tar.gz -/certbot-nginx-0.38.0.tar.gz -/certbot-nginx-0.39.0.tar.gz -/certbot-nginx-0.39.0.tar.gz.asc -/certbot-nginx-1.0.0.tar.gz -/certbot-nginx-1.0.0.tar.gz.asc -/certbot-nginx-1.2.0.tar.gz -/certbot-nginx-1.2.0.tar.gz.asc -/certbot-nginx-1.3.0.tar.gz -/certbot-nginx-1.3.0.tar.gz.asc +/certbot-nginx-*.tar.gz +/certbot-nginx-*.tar.gz.asc diff --git a/python-certbot-nginx-remove-mock-runtime-dependency.patch b/python-certbot-nginx-remove-mock-runtime-dependency.patch deleted file mode 100644 index 34cd263..0000000 --- a/python-certbot-nginx-remove-mock-runtime-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py -index fe707fb..c63ad9c 100644 ---- a/setup.py -+++ b/setup.py -@@ -11,7 +11,6 @@ version = '1.3.0' - install_requires = [ - 'acme>=1.0.0', - 'certbot>=1.1.0', -- 'mock', - 'PyOpenSSL', - 'pyparsing>=1.5.5', # Python3 support - 'setuptools', diff --git a/python-certbot-nginx.spec b/python-certbot-nginx.spec index 231abfb..12d4ae9 100644 --- a/python-certbot-nginx.spec +++ b/python-certbot-nginx.spec @@ -13,7 +13,7 @@ %endif Name: python-%{pypi_name} -Version: 1.3.0 +Version: 1.4.0 Release: 1%{?dist} Summary: The nginx plugin for certbot @@ -27,8 +27,6 @@ Source1: %{pypi_source}.asc # gpg2 --export --export-options export-minimal A2CFB51FA275A7286234E7B24D17C995CD9775F2 > gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg Source2: gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg -Patch0: %{name}-remove-mock-runtime-dependency.patch - BuildArch: noarch %if %{with python2} @@ -41,8 +39,8 @@ BuildRequires: python3-devel %if %{with python2} #For running tests -BuildRequires: python2-acme >= 1.0.0 -BuildRequires: python2-certbot >= 1.1.0 +BuildRequires: python2-acme >= 1.4.0 +BuildRequires: python2-certbot >= 1.4.0 BuildRequires: python2-mock %if 0%{?rhel} # EL7 has unversioned names for these packages @@ -59,9 +57,8 @@ BuildRequires: python2-zope-interface %endif %if %{with python3} -BuildRequires: python3-acme >= 1.0.0 -BuildRequires: python3-certbot >= 1.1.0 -BuildRequires: python3-mock +BuildRequires: python3-acme >= 1.4.0 +BuildRequires: python3-certbot >= 1.4.0 BuildRequires: python3-pyparsing >= 1.5.5 BuildRequires: python3-pytest BuildRequires: python3-setuptools @@ -82,8 +79,8 @@ 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 >= 1.0.0 -Requires: python2-certbot >= 1.0.0 +Requires: python2-acme >= 1.4.0 +Requires: python2-certbot >= 1.4.0 %if 0%{?rhel} Requires: pyparsing >= 1.5.5 %else @@ -91,9 +88,9 @@ Requires: python2-pyparsing >= 1.5.5 %endif %if 0%{?fedora} #Recommend the CLI as that will be the interface most use -Recommends: certbot >= 1.0.0 +Recommends: certbot >= 1.4.0 %else -Requires: certbot >= 1.0.0 +Requires: certbot >= 1.4.0 %endif Summary: The nginx plugin for certbot %{?python_provide:%python_provide python2-%{pypi_name}} @@ -110,14 +107,14 @@ Provides: %{pypi_name} = %{version}-%{release} %endif # Although a plugin for the certbot command it's technically # an extension to the certbot python libraries -Requires: python3-acme >= 1.0.0 -Requires: python3-certbot >= 1.0.0 +Requires: python3-acme >= 1.4.0 +Requires: python3-certbot >= 1.4.0 Requires: python3-pyparsing >= 1.5.5 %if 0%{?fedora} #Recommend the CLI as that will be the interface most use -Recommends: certbot >= 1.0.0 +Recommends: certbot >= 1.4.0 %else -Requires: certbot >= 1.0.0 +Requires: certbot >= 1.4.0 %endif Summary: The nginx plugin for certbot %{?python_provide:%python_provide python3-%{pypi_name}} @@ -176,6 +173,9 @@ rm -rf %{pypi_name}.egg-info %endif %changelog +* Sat May 09 2020 Felix Schwarz - 1.4.0-1 +- Update to 1.4.0 (#1831930) + * Wed Mar 04 2020 Felix Schwarz - 1.3.0-1 - Update to 1.3.0 (#1809810) diff --git a/sources b/sources index 0198d14..d9a626c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (certbot-nginx-1.3.0.tar.gz) = 7e6a02720ffecdc825c2e194dc5c952f0414dd2d32774e0eb7767b01b30234e8cd57b0c9201ce8bf8f5d34fbf4b1b5459a99c1ddc87d4a8a4e2039b342aa94e7 -SHA512 (certbot-nginx-1.3.0.tar.gz.asc) = bb15e2a0692d211ee2f178e73b08bc58223d765cf5301f50b9bfd1c44dad06e9957aa68d1efba7e408bb405a85b50f20beeb7183375b059506ed6f8902b92800 +SHA512 (certbot-nginx-1.4.0.tar.gz) = e85945de33baa96194ed870e8ea3189713b057b54203851d05554267c7eea34f78ea747d110b18723c4cfa1b4f258bbf0df86212347bb72d529b2ddd3f3aa81e +SHA512 (certbot-nginx-1.4.0.tar.gz.asc) = b866650549055ab80c3ab37fc0afed3cdc0e976a4749e226cacdb1e64ccc2c08c3f98c26a45ce5ce06b5f41e4c17557ca115dacc985d1db1961fe9349cc2ef0a