From 11a0448d115edba785c9df28861c63aa8dd2306f Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <shawn@iwin.ski>
Date: Jan 12 2017 17:35:24 +0000
Subject: Update to 1.22


- Spec cleanup

---

diff --git a/.gitignore b/.gitignore
index c3147c3..e9bad3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /honeypot-7.x-1.16.tar.gz
+/honeypot-7.x-1.22.tar.gz
diff --git a/drupal7-honeypot-RPM-README.txt b/drupal7-honeypot-RPM-README.txt
deleted file mode 100644
index e15a506..0000000
--- a/drupal7-honeypot-RPM-README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-After installation, you must enable this module from the Drupal administration
-page.
-
-If upgrading this module separately from the core Drupal package, be sure to
-run the http://hostname/drupal7/upgrade.php script after this RPM is upgraded.
diff --git a/drupal7-honeypot.spec b/drupal7-honeypot.spec
index dbb4682..b20e1e0 100644
--- a/drupal7-honeypot.spec
+++ b/drupal7-honeypot.spec
@@ -3,33 +3,43 @@
 %global module honeypot
 
 Name:          drupal7-%{module}
-Version:       1.16
+Version:       1.22
 Release:       1%{?dist}
-Summary:       Honeypot uses both the honeypot and timestamp methods of deterring spam bots
+Summary:       Mitigates spam form submissions using the honeypot method
 
 Group:         Applications/Publishing
 License:       GPLv2+
 URL:           http://drupal.org/project/%{module}
 Source0:       http://ftp.drupal.org/files/projects/%{module}-7.x-%{version}.tar.gz
-Source1:       %{name}-RPM-README.txt
 
 BuildArch:     noarch
 BuildRequires: drupal7-rpmbuild >= 7.23-3
 
-# phpcompatinfo (computed from version 1.16)
+# phpcompatinfo (computed from version 1.22)
+Requires:      php-ctype
 Requires:      php-pcre
 
 %description
 Honeypot uses both the honeypot and timestamp methods of deterring spam bots
-from completing forms on your Drupal site.
+from completing forms on your Drupal site (read more here). These methods are
+effective against many spam bots, and are not as intrusive as CAPTCHAs or other
+methods which punish the user [YouTube].
 
-This package provides the following Drupal module(s):
+The module currently supports enabling for all forms on the site, or particular
+forms like user registration or password reset forms, webforms, contact forms,
+node forms, and comment forms.
+
+This package provides the following Drupal module:
 * %{module}
 
 
 %prep
 %setup -qn %{module}
-cp -p %{SOURCE1} .
+
+: Licenses and docs
+mkdir -p .rpm/{licenses,docs}
+mv LICENSE.txt .rpm/licenses/
+mv *.txt .rpm/docs/
 
 
 %build
@@ -37,16 +47,21 @@ cp -p %{SOURCE1} .
 
 
 %install
-mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+mkdir -p %{buildroot}%{drupal7_modules}/%{module}
 cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
 
 
 %files
-%doc *.txt
+%{!?_licensedir:%global license %%doc}
+%license .rpm/licenses/*
+%doc .rpm/docs/*
 %{drupal7_modules}/%{module}
-%exclude %{drupal7_modules}/%{module}/*.txt
 
 
 %changelog
+* Thu Jan 12 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.22-1
+- Update to 1.22
+- Spec cleanup
+
 * Sat May 24 2014 Peter Borsa <peter.borsa@gmail.com> 1.16-1
 - Initial package
diff --git a/sources b/sources
index 2bf5b14..e649add 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (honeypot-7.x-1.16.tar.gz) = 78c70f89c716c6027e8eae2a1fa35bc86578bfe6796218e20520ca20036ed147c927483dc9bd398fbf0c35b4058f8b58451f64cbfbc9f6401b7be411852a6698
+SHA512 (honeypot-7.x-1.22.tar.gz) = 57891c0d83ebfd6c15e529f2b7dff95d27b66c502e91ecbb4d33d3bb407195cb6dd0c936f4b00987c2f66c2613683461410930147a48cd586adbc12a79c9876c