PR#5: adapt conditions for EPEL 8, remove python3-mock runtime dependency - rpms/python-acme

rpms / python-acme

#5 adapt conditions for EPEL 8, remove python3-mock runtime dependency

Merged 4 years ago by itamarjp. Opened 4 years ago by fschwarz.

Unknown source epel8-bringup into master

remove runtime dependency on "mock"

Felix Schwarz • 4 years ago

ab2e54d

adapt conditions for EPEL8

Felix Schwarz • 4 years ago

1639c2c

python-acme-remove-mock-runtime-dependency.patch

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ diff --git a/setup.py b/setup.py`
		`+ index 8551821..741fc84 100644`
		`+ --- a/setup.py`
		`+ +++ b/setup.py`
		`+ @@ -14,7 +14,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',`
		`+ # Connection.set_tlsext_host_name (>=0.13)`
		`+ 'PyOpenSSL>=0.13.1',`
		`+ 'pyrfc3339',`

python-acme.spec

file modified

+15 -4

		`@@ -1,12 +1,12 @@`
		`%global srcname acme`

		`- %if 0%{?fedora}`
		`+ %if (0%{?fedora}) \|\| (0%{?rhel} && 0%{?rhel} >= 8)`
		`%bcond_without python3`
		`%else`
		`%bcond_with python3`
		`%endif`

		`- %if 0%{?fedora} && 0%{?fedora} >= 30`
		`+ %if (0%{?fedora} && 0%{?fedora} >= 30) \|\| (0%{?rhel} && 0%{?rhel} >= 8)`
		`%bcond_with python2`
		`%global SPHINXBUILD sphinx-build-3`
		`%else`
		`@@ -16,7 +16,7 @@`

		`Name: python-acme`
		`Version: 1.0.0`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: Python library for the ACME protocol`
		`License: ASL 2.0`
		`URL: https://pypi.python.org/pypi/acme`
		`@@ -30,9 +30,12 @@`

		`# When running tests argparse is not recognised as provided by core`

		`- %if 0%{?rhel}`
		`+ %if 0%{?rhel} && 0%{?rhel} == 7`
		`Patch0: epel7-setup.patch`
		`%endif`
		`+ # https://github.com/certbot/certbot/issues/6604`
		`+ # also: https://github.com/certbot/certbot/issues/6604`
		`+ Patch1: python-acme-remove-mock-runtime-dependency.patch`

		`%if %{with python2}`
		`BuildRequires: python2-devel`
		`@@ -93,6 +96,10 @@`

		`# Used to verify OpenPGP signature`
		`BuildRequires: gnupg2`
		`+ %if 0%{?rhel} && 0%{?rhel} == 8`
		`+ # "gpgverify" macro, not in COPR buildroot by default`
		`+ BuildRequires: epel-rpm-macros >= 8-5`
		`+ %endif`

		`BuildArch: noarch`

		`@@ -243,6 +250,10 @@`
		`%endif`

		`%changelog`
		`+ * Thu Dec 05 2019 Felix Schwarz <fschwarz@fedoraproject.org> 1.0.0-2`
		`+ - adapt conditions for EPEL8`
		`+ - remove runtime dependency on mock`
		`+`
		`* Thu Dec 05 2019 Eli Young <elyscape@gmail.com> - 1.0.0-1`
		`- Update to 1.0.0 (#1769084)`

fschwarz commented 4 years ago

@elyscape I noticed you already started this task in https://bugzilla.redhat.com/show_bug.cgi?id=1774668 but maybe this PR helps (but feel free to ignore).

itamarjp commented 4 years ago

We can commit it, but won't work because this is still in epel-testing.

https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2019-92c30fbb1e

fschwarz commented 4 years ago

imho epel-testing is not a problem - the spec uses %{gpgverify} already (since commit 873b2a8 ). %{gpgverify} is provided by epel-rpm-macros >= 8-5 so if we don't have that version the build will fail anyway.

I noticed that my COPR build root did not had epel-rpm-macros by default - I added it so I can try intermediate versions in COPR (but we can also drop it for the official spec file if you want).

itamarjp commented 4 years ago

looks good, lets commit and move on.