Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save holishing/cde18be7fde099364ab1c4dc4acf92bd to your computer and use it in GitHub Desktop.
Save holishing/cde18be7fde099364ab1c4dc4acf92bd to your computer and use it in GitHub Desktop.
Add patch for epel to lower the requirements of pyparsing
From eaaba5eee86a603b2a4f8ac84ae6dd2b60e8bc9b Mon Sep 17 00:00:00 2001
From: Sean Ho <[email protected]>
Date: Tue, 23 Feb 2021 12:17:02 +0000
Subject: [PATCH] Add patch for epel to lower the requirements of pyparsing
version
---
...ements-of-pyparsing-version-to-1.5.5.patch | 26 +++++++++++++++++++
python-certbot-nginx.spec | 9 +++++--
2 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 0001-lower-the-requirements-of-pyparsing-version-to-1.5.5.patch
diff --git a/0001-lower-the-requirements-of-pyparsing-version-to-1.5.5.patch b/0001-lower-the-requirements-of-pyparsing-version-to-1.5.5.patch
new file mode 100644
index 0000000..cfe8fb7
--- /dev/null
+++ b/0001-lower-the-requirements-of-pyparsing-version-to-1.5.5.patch
@@ -0,0 +1,26 @@
+From 0864977a53f669650c690bb22a4ef87adb43dd58 Mon Sep 17 00:00:00 2001
+From: Sean Ho <[email protected]>
+Date: Tue, 23 Feb 2021 12:01:22 +0000
+Subject: [PATCH] lower the requirements of pyparsing version to 1.5.5
+
+try to let it compatible with epel8, epel7
+---
+ certbot-nginx/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py
+index 7bd4070e..f287e821 100644
+--- a/certbot-nginx/setup.py
++++ b/certbot-nginx/setup.py
+@@ -13,7 +13,7 @@ install_requires = [
+ 'acme>=1.4.0',
+ 'certbot>=1.6.0',
+ 'PyOpenSSL>=17.3.0',
+- 'pyparsing>=2.2.0',
++ 'pyparsing>=1.5.5',
+ 'setuptools>=39.0.1',
+ 'zope.interface',
+ ]
+--
+2.27.0
+
diff --git a/python-certbot-nginx.spec b/python-certbot-nginx.spec
index 2fdfec7..6982cf8 100644
--- a/python-certbot-nginx.spec
+++ b/python-certbot-nginx.spec
@@ -14,7 +14,7 @@
Name: python-%{pypi_name}
Version: 1.12.0
-Release: 1%{?dist}
+Release: 1.1%{?dist}
Summary: The nginx plugin for certbot
License: ASL 2.0
@@ -26,6 +26,7 @@ Source1: %{pypi_source}.asc
# gpg2 --keyserver pool.sks-keyservers.net --recv-key A2CFB51FA275A7286234E7B24D17C995CD9775F2
# gpg2 --export --export-options export-minimal A2CFB51FA275A7286234E7B24D17C995CD9775F2 > gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg
Source2: gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg
+Patch0: 0001-lower-the-requirements-of-pyparsing-version-to-1.5.5.patch
BuildArch: noarch
@@ -125,7 +126,8 @@ Plugin for certbot that allows for automatic configuration of nginx
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1 -n %{pypi_name}-%{version}
+# for certbot-nginx is subdirectory of certbot's VCS control
+%autosetup -p2 -n %{pypi_name}-%{version}
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
@@ -173,6 +175,9 @@ rm -rf %{pypi_name}.egg-info
%endif
%changelog
+* Tue Feb 23 2021 Sean Ho <[email protected]> - 1.12.0-1.1
+- Fix pyparsing dependencies
+
* Tue Feb 2 2021 Nick Bebout <[email protected]> - 1.12.0-1
- Update to 1.12.0
--
2.27.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment