From b97e49234e4d2328652c4fbc57ea3272dec43caa Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Nov 28 2019 00:25:56 +0000
Subject: Somewhat clean up spec file


---

diff --git a/.gitignore b/.gitignore
index f2642ec..e0ef8bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /certbot-0.37.2.tar.gz
 /certbot-0.38.0.tar.gz
 /certbot-0.39.0.tar.gz
+/certbot-0.39.0.tar.gz.asc
diff --git a/certbot.spec b/certbot.spec
index 8586e0b..232a1c8 100644
--- a/certbot.spec
+++ b/certbot.spec
@@ -1,5 +1,4 @@
 %global oldpkg letsencrypt
-%global srcname certbot
 
 %if 0%{?fedora}
 %bcond_without python3
@@ -20,11 +19,12 @@ Summary:        A free, automated certificate authority client
 
 License:        ASL 2.0
 URL:            https://pypi.python.org/pypi/certbot
-Source0:        %pypi_source
-Source1:        %pypi_source.asc
-# key mentioned in docs https://certbot.eff.org/docs/install.html#certbot-auto
-# gpg2 --keyserver pool.sks-keyservers.net --recv-key A2CFB51FA275A7286234E7B24D17C995CD9775F2
-# gpg2 --export --export-options export-minimal A2CFB51FA275A7286234E7B24D17C995CD9775F2 > gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg
+Source0:        %{pypi_source}
+Source1:        %{pypi_source}.asc
+# Key mentioned in https://certbot.eff.org/docs/install.html#certbot-auto
+# Keyring generation steps as follows:
+#   gpg2 --keyserver pool.sks-keyservers.net --recv-key A2CFB51FA275A7286234E7B24D17C995CD9775F2
+#   gpg2 --export --export-options export-minimal A2CFB51FA275A7286234E7B24D17C995CD9775F2 > gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg
 Source2:        gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg
 
 Source10:       certbot-renew-systemd.service
@@ -34,7 +34,6 @@ Source13:       certbot-README.fedora
 
 BuildArch:      noarch
 
-BuildRequires:  gnupg2
 %if %{with python2}
 BuildRequires:  python2-acme >= 0.29.0
 BuildRequires:  python2-configargparse
@@ -106,6 +105,9 @@ BuildRequires:  python3-sphinx_rtd_theme
 %{?systemd_requires}
 BuildRequires:  systemd
 
+# Used to verify OpenPGP signature
+BuildRequires:  gnupg2
+
 # Need to label the httpd rw stuff correctly until base selinux policy updated
 Requires(post): %{_sbindir}/restorecon
 %if 0%{?rhel} && 0%{?rhel} <= 7
@@ -294,7 +296,7 @@ restorecon -R %{_sysconfdir}/letsencrypt || :
 
 %changelog
 * Thu Nov 21 2019 Felix Schwarz <fschwarz@fedoraproject.org> 0.39.0-2
-- use GPG source file verification
+- Verify source OpenPGP signature
 
 * Tue Oct 01 2019 Eli Young <elyscape@gmail.com> - 0.39.0-1
 - Update to 0.39.0 (#1757575)