From d0900dfd807714d991c25b7214b52241d13368ac Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Mar 01 2020 22:01:26 +0000 Subject: update to 1.2.0 --- diff --git a/.gitignore b/.gitignore index 65e7c8d..e099928 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ /certbot-1.0.0.tar.gz.asc /certbot-1.1.0.tar.gz /certbot-1.1.0.tar.gz.asc +/certbot-1.2.0.tar.gz +/certbot-1.2.0.tar.gz.asc diff --git a/certbot-remove-mock-runtime-dependency.patch b/certbot-remove-mock-runtime-dependency.patch deleted file mode 100644 index 4089844..0000000 --- a/certbot-remove-mock-runtime-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py -index 8b45fd8..cf42af6 100644 ---- a/setup.py -+++ b/setup.py -@@ -45,7 +45,6 @@ install_requires = [ - # 1.1.0+ is required to avoid the warnings described at - # https://github.com/certbot/josepy/issues/13. - 'josepy>=1.1.0', -- 'mock', - 'parsedatetime>=1.3', # Calendar.parseDT - 'pyrfc3339', - 'pytz', diff --git a/certbot.spec b/certbot.spec index e1ff310..276f7a6 100644 --- a/certbot.spec +++ b/certbot.spec @@ -22,8 +22,8 @@ %endif Name: certbot -Version: 1.1.0 -Release: 1%{?dist} +Version: 1.2.0 +Release: 2%{?dist} Summary: A free, automated certificate authority client License: ASL 2.0 @@ -41,16 +41,13 @@ Source11: certbot-renew-systemd.timer Source12: certbot-sysconfig-certbot Source13: certbot-README.fedora -# https://github.com/certbot/certbot/issues/6604 -Patch0: certbot-remove-mock-runtime-dependency.patch - BuildArch: noarch %if %{with python2} BuildRequires: python2-acme >= 0.40.0 -BuildRequires: python2-configargparse -BuildRequires: python2-cryptography -BuildRequires: python2-distro +BuildRequires: python2-configargparse >= 0.9.3 +BuildRequires: python2-cryptography >= 1.2.3 +BuildRequires: python2-distro >= 1.0.1 BuildRequires: python2-josepy >= 1.1.0 BuildRequires: python2-mock BuildRequires: python2-pyrfc3339 @@ -60,7 +57,7 @@ BuildRequires: python2-pyrfc3339 BuildRequires: pytest BuildRequires: python-configobj BuildRequires: python-devel -BuildRequires: python-parsedatetime +BuildRequires: python-parsedatetime >= 1.3 BuildRequires: python-setuptools BuildRequires: python-zope-component BuildRequires: python-zope-interface @@ -68,7 +65,7 @@ BuildRequires: pytz %else BuildRequires: python2-configobj BuildRequires: python2-devel -BuildRequires: python2-parsedatetime +BuildRequires: python2-parsedatetime >= 1.3 BuildRequires: python2-pytest BuildRequires: python2-pytz BuildRequires: python2-setuptools @@ -86,14 +83,14 @@ BuildRequires: python2-sphinx_rtd_theme %if %{with python3} BuildRequires: python3-acme >= 0.40.0 -BuildRequires: python3-configargparse +BuildRequires: python3-configargparse >= 0.9.3 BuildRequires: python3-configobj -BuildRequires: python3-cryptography +BuildRequires: python3-cryptography >= 1.2.3 BuildRequires: python3-devel -BuildRequires: python3-distro +BuildRequires: python3-distro >= 1.0.1 BuildRequires: python3-josepy >= 1.1.0 BuildRequires: python3-mock -BuildRequires: python3-parsedatetime +BuildRequires: python3-parsedatetime >= 1.3 BuildRequires: python3-pyrfc3339 BuildRequires: python3-pytest BuildRequires: python3-pytz @@ -144,23 +141,25 @@ to lower the barriers to entry for encrypting all HTTP traffic on the internet. %if %{with python2} %package -n python2-certbot Requires: python2-acme >= 0.40.0 -Requires: python2-configargparse -Requires: python2-cryptography -Requires: python2-distro +Requires: python2-configargparse >= 0.9.3 +Requires: python2-cryptography >= 1.2.3 +Requires: python2-distro >= 1.0.1 Requires: python2-josepy >= 1.1.0 +# certbot.tests is considered part of the public API +Requires: python2-mock Requires: python2-pyrfc3339 %if 0%{?rhel} && 0%{?rhel} <= 7 # EL7 has unversioned names for these packages Requires: python-configobj -Requires: python-parsedatetime +Requires: python-parsedatetime >= 1.3 Requires: python-setuptools Requires: python-zope-component Requires: python-zope-interface Requires: pytz %else Requires: python2-configobj -Requires: python2-parsedatetime +Requires: python2-parsedatetime >= 1.3 Requires: python2-pytz Requires: python2-setuptools Requires: python2-zope-component @@ -188,6 +187,8 @@ Requires: python3-configobj Requires: python3-cryptography Requires: python3-distro Requires: python3-josepy >= 1.1.0 +# certbot.tests is considered part of the public API +Requires: python3-mock Requires: python3-parsedatetime Requires: python3-pyrfc3339 Requires: python3-pytz @@ -251,7 +252,8 @@ install -dm 0755 %{buildroot}%{_sharedstatedir}/%{oldpkg} %check %if %{with python2} -(cd build/lib && %{__python2} ../../setup.py test) +cp -a setup.* README.rst tests build/lib/ +(cd build/lib && %{__python2} setup.py test) %endif %if %{with python3} %{__python3} setup.py test @@ -263,8 +265,6 @@ grep -q %{__python2} %{buildroot}%{_bindir}/certbot-2 %if %{with python3} grep -q %{__python3} %{buildroot}%{_bindir}/certbot-3 %endif -# do not ship tests -rm -rf %{buildroot}%{python3_sitelib}/%{name}/tests # The base selinux policies don't handle the certbot directories yet so set them up manually %post @@ -304,6 +304,18 @@ restorecon -R %{_sysconfdir}/letsencrypt || : %endif %changelog +* Sun Feb 23 2020 Felix Schwarz - 1.2.0-2 +- re-added "python-mock" as runtime dependency + +* Fri Feb 07 2020 Felix Schwarz - 1.2.0-1 +- Update to 1.2.0 (#1791087) + +* Sun Feb 02 2020 Felix Schwarz - 1.1.0-3 +- do not strip "certbot.tests" + +* Tue Jan 28 2020 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jan 23 2020 Felix Schwarz 1.1.0-1 - Update to 1.1.0 diff --git a/sources b/sources index 98e7696..98d1aba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (certbot-1.1.0.tar.gz) = b13a965bc89f8e5310d1580de8866935d53924a398b8f374c32feac761232c13c848b19d7a91e9a61cb56e9e0bf7ff79cc7468bb5fadbf3c9eef63b2ab501e04 -SHA512 (certbot-1.1.0.tar.gz.asc) = 5d957cbc308bab5db0e758856dc0a3f29fe30421433cd139053a4313b930bca23c5c9e59cec88f6b69be4f6c5ada050d46f1260ced78cdbde6eb5e2c97a67170 +SHA512 (certbot-1.2.0.tar.gz) = e4e3855c8f3dde27554932a4db226c93b16588d91eed07415a7161776b93d1d006313ccaf10a05c5dc369843f4141dec2b0f98201967995b83ea3a036837cda7 +SHA512 (certbot-1.2.0.tar.gz.asc) = 28015b6cd867574594d080befab4e74db0dfa92585dd488bdb16c130885830cb32a18f6bbc8cf07a687fa174f5d53d3573c45300ee3f8d8e46b954bd34740972