From 7f9043064a6728221d717adaf246040d5c3f5365 Mon Sep 17 00:00:00 2001
From: Stuart D. Gathman <stuart@gathman.org>
Date: May 22 2018 19:11:43 +0000
Subject: Update to new upstream release and create core subpackage.


---

diff --git a/.gitignore b/.gitignore
index 38b8735..d30c65e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /acme-tiny-5a7b4e7.tar.gz
 /acme-tiny-af025f5.tar.gz
+/acme-tiny-4.0.4.tar.gz
diff --git a/acme-tiny.spec b/acme-tiny.spec
index f8f482b..476c138 100644
--- a/acme-tiny.spec
+++ b/acme-tiny.spec
@@ -1,6 +1,3 @@
-%global commit		af025f5bf19c70be7fafab67f4dd718ca7bf9adf
-%global shortcommit	af025f5
-%global checkout	20170516git%{shortcommit}
 
 %if 0%{?rhel} >= 5 && 0%{?rhel} < 7
 %global use_systemd 0
@@ -17,14 +14,14 @@
 %endif
 
 Name:		acme-tiny
-Version:	0.2
-Release:	4.%{checkout}%{?dist}
+Version:	4.0.4
+Release:	1%{?dist}
 Summary:	Tiny auditable script to issue, renew Let's Encrypt certificates
 
 Group:		Applications/Internet
 License:	MIT
 URL:		https://github.com/diafygi/acme-tiny
-Source0:	https://github.com/diafygi/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz
+Source0:	https://github.com/diafygi/acme-tiny/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:	acme-tiny-sign.sh
 Source2:	cert-check.py
 Source3:	acme.conf
@@ -34,16 +31,11 @@ Source6:	acme-tiny.timer
 Source7:	acme-tiny.service
 Source8:	README-fedora.md
 # Fetch and include intermediate cert(s), too.
-Patch0:		acme-tiny-chain.patch
+#Patch0:		acme-tiny-chain.patch
 # Python3 broke getallmatchingheaders() and the fix breaks python2
 Patch1:		acme-tiny-chain2.patch
 
-Requires:	openssl
 Requires(pre): shadow-utils
-%if 0%{?rhel} >= 5 && 0%{?rhel} < 7
-# EL6 uses python2.6, which does not include argparse
-Requires:	python-argparse
-%endif
 %if %{use_systemd}
 # systemd macros are not defined unless systemd is present
 BuildRequires: systemd
@@ -51,6 +43,7 @@ BuildRequires: systemd
 %else
 Requires:	cronie
 %endif
+Requires: %{name}-core = %{version}-%{release}
 BuildArch:	noarch
 %if 0%{?fedora}
 Suggests: httpd, mod_ssl, nginx
@@ -68,14 +61,29 @@ Well, that and a web server - but then you only need this with a web server.
 This package adds a simple directory layout and timer service that runs
 acme_tiny on installed CSRs as the acme user for privilege separation.
 
+%package core
+Summary: core python module of acme-tiny
+Group: System Environment/Base
+Requires:	openssl
+%if 0%{?rhel} >= 5 && 0%{?rhel} < 7
+# EL6 uses python2.6, which does not include argparse
+Requires:	python-argparse
+%endif
+BuildArch: noarch
+
+%description core
+Includes only the core acme_tiny.py script and its dependencies.
+Alternate frameworks that use acme_tiny.py can install this to avoid pulling in
+unneeded packages.
+
 %prep
-%setup -q -n %{name}-%{commit}
+%setup -q -n %{name}-%{version}
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE8} .
 %if %{use_python3}
-%patch0 -p1 -b .chain
+#patch0 -p1 -b .chain
 sed -i.old -e '1,1 s/python$/python3/' *.py
-%else
-%patch1 -p1 -b .chain
+#else
+#patch1 -p1 -b .chain
 %endif
 
 %build
@@ -127,7 +135,7 @@ exit 0
 %files
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
-%doc README.md README-fedora.md
+%doc README-fedora.md
 %attr(0755,acme,acme) /var/www/challenges
 %attr(-,acme,acme) %{_sharedstatedir}/acme
 %{_libexecdir}/%{name}
@@ -137,12 +145,20 @@ exit 0
 %else
 %config(noreplace) %{_sysconfdir}/cron.d/acme-tiny
 %endif
-/usr/sbin/acme_tiny
-/usr/sbin/acme-tiny
-/usr/sbin/acme-tiny-sign
-/usr/sbin/cert-check
+%{_sbindir}/acme-tiny-sign
+%{_sbindir}/cert-check
+%{_sbindir}/acme-tiny
+
+%files core
+%license LICENSE
+%doc README.md
+%{_sbindir}/acme_tiny
 
 %changelog
+* Tue May 22 2018 Stuart D. Gathman <stuart@gathman.org> 4.0.4-1
+- Official upstream release!
+- Move acme_tiny.py to acme-tiny-core subpackage
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2-4.20170516gitaf025f5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 2bc2674..298ec7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acme-tiny-af025f5.tar.gz) = e322bcdda859cca1afd9c3b8c707d33ee46e590a63a28346a3eaf76b2ef1961ea0cf8be1aabe600ddf5c47caef1d2972cdc50c693a42170fd7ddfe124db319e0
+SHA512 (acme-tiny-4.0.4.tar.gz) = e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4