- up to 1.27.0

- build python3 only
- Require external pythonm3-acme instead of building a duplicate here

diff --git a/certbot.spec b/certbot.spec
index 895df6d5432f10ea613d8044572f8677d5e5092b..801f02a70b55fb967ad8c3eccf6508b92ee68576 100644 (file)
--- a/certbot.spec
+++ b/certbot.spec
@@ -1,38 +1,33 @@
 #
 # Conditional build:
-%bcond_with    doc             # build doc
+%bcond_without doc             # build doc
 %bcond_with    tests           # do perform tests (pulls extra dependencies from network)
-%bcond_without python3         # build CPython 3.x ACME module
 
 Summary:       Certbot -  EFF's tool to obtain certs from Let's Encrypt
 Name:          certbot
-Version:       0.40.1
-Release:       7
+Version:       1.27.0
+Release:       0.1
 License:       Apache v2.0
 Group:         Applications/Networking
 Source0:       https://github.com/certbot/certbot/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 6b187c9b843c715b5486ac4b212316cd
+# Source0-md5: 09aaa677ed9d47699c2d575b5a4a147e
 URL:           https://certbot.eff.org/
-BuildRequires: python-setuptools
+BuildRequires: python3-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.713
 %if %{with doc}
-BuildRequires: python-repoze.sphinx.autointerface
-BuildRequires: sphinx-pdg
+BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: sphinx-pdg >= 4.5.0
 %endif
 %if %{with tests}
 BuildRequires: Zope-Interface
-BuildRequires: python-mock
-BuildRequires: python-six
+BuildRequires: python3-mock
+BuildRequires: python3-six
 %endif
-%if %{with python3}
 BuildRequires: python3-setuptools
+Requires:      python3-acme >= %{version}
 Requires:      python3-zope.component >= 4.4.1
 Requires:      python3-ndg-httpsclient
-%else:
-Requires:      python-zope.component >= 4.4.1
-Requires:      python-ndg-httpsclient
-%endif
 Obsoletes:     letsencrypt
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,113 +42,39 @@ certificates from trusted third parties called certificate authorities
 from Let's Encrypt - an open certificate authority launched by the
 EFF, Mozilla, and others - and deploys it to a web server.
 
-%package -n python-acme
-Summary:       Python library for the ACME protocol
-Group:         Libraries/Python
-Obsoletes:     python-acme-doc < 0.9.3
-
-%description -n python-acme
-Python 2 library for use of the Automatic Certificate Management
-Environment protocol as defined by the IETF. It's used by the Let's
-Encrypt project.
-
-%package -n python3-acme
-Summary:       Python library for the ACME protocol
-Group:         Libraries/Python
-
-%description -n python3-acme
-Python 3 library for use of the Automatic Certificate Management
-Environment protocol as defined by the IETF. It's used by the Let's
-Encrypt project.
-
 %prep
 %setup -q
 
 %build
-%py_build %{?with_tests:test}
-
-%if %{with doc}
-cd docs
-%{__make} -j1 html
-rm -r _build/html/_sources
-%endif
-
-cd acme
-%py_build %{?with_tests:test}
-
-%if %{with python3}
+cd certbot
 %py3_build %{?with_tests:test}
-%endif
 
 %if %{with doc}
-cd docs
-%{__make} -j1 html
-rm -rf _build/html/_sources
+%{__make} -C docs html
+%{__rm} -r docs/_build/html/_sources
 %endif
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/var/log,/var/lib}/letsencrypt
 
-%if %{with python3}
-%py3_install
-%else
-%py_install
-%endif
-
-cd acme
-
-%py_install
-
-%if %{with python3}
+cd certbot
 %py3_install
-%endif
-cd ..
-
-%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.rst CHANGELOG.md CONTRIBUTING.md docs/*.txt docs/*.rst
+%doc README.rst CHANGELOG.md CONTRIBUTING.md certbot/docs/*.txt
 %if %{with doc}
-%doc docs/_build/html/*
+%doc certbot/docs/_build/html/*
 %else
-%doc docs/*.rst docs/api docs/man
+%doc certbot/docs/*.rst certbot/docs/api certbot/docs/man
 %endif
 %dir %{_sysconfdir}/letsencrypt
 %dir /var/log/letsencrypt
 %dir /var/lib/letsencrypt
 %attr(755,root,root) %{_bindir}/certbot
-%if %{with python3}
 %{py3_sitescriptdir}/certbot
 %{py3_sitescriptdir}/certbot-%{version}*-py*.egg-info
-%else
-%{py_sitescriptdir}/certbot
-%{py_sitescriptdir}/certbot-%{version}*-py*.egg-info
-%endif
-
-%files -n python-acme
-%defattr(644,root,root,755)
-%doc acme/README.rst
-%if %{with doc}
-%doc acme/docs/_build/html/*
-%else
-%doc acme/docs/*.rst acme/docs/api acme/docs/man
-%endif
-%{py_sitescriptdir}/acme
-%{py_sitescriptdir}/acme-%{version}*-py*.egg-info
-
-%files -n python3-acme
-%defattr(644,root,root,755)
-%doc acme/README.rst
-%if %{with doc}
-%doc acme/docs/_build/html/*
-%else
-%doc acme/docs/*.rst acme/docs/api acme/docs/man
-%endif
-%{py3_sitescriptdir}/acme
-%{py3_sitescriptdir}/acme-%{version}*-py*.egg-info