[drupal7-variable] Updated to 2.4 (BZ #1056423; release notes https://drupal.org/node/2178137)

[Shawn Iwinski]

commit 11868130e2f27a6b2ad290e3900f315eadbf0905
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sat Jan 25 15:31:03 2014 -0500

    Updated to 2.4 (BZ #1056423; release notes https://drupal.org/node/2178137)
    
    - Spec cleanup

 .gitignore                         |    1 +
 drupal7-variable-LICENSE.txt       |  339 ------------------------------------
 drupal7-variable-RPM-README.txt    |    5 +
 drupal7-variable-fedora-README.txt |    6 -
 drupal7-variable.spec              |   61 ++++---
 sources                            |    1 +
 6 files changed, 43 insertions(+), 370 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5370b0f..b898d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /variable-7.x-2.1.tar.gz
 /variable-7.x-2.2.tar.gz
 /variable-7.x-2.3.tar.gz
+/variable-7.x-2.4.tar.gz
diff --git a/drupal7-variable-RPM-README.txt b/drupal7-variable-RPM-README.txt
new file mode 100644
index 0000000..e15a506
--- /dev/null
+++ b/drupal7-variable-RPM-README.txt
@@ -0,0 +1,5 @@
+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-variable.spec b/drupal7-variable.spec
index 84cd969..90b50ff 100644
--- a/drupal7-variable.spec
+++ b/drupal7-variable.spec
@@ -1,19 +1,24 @@
-%define drupaldir %{_datadir}/drupal7
-Name:	drupal7-variable
-Version:	2.3
-Release:	1%{?dist}
-Summary: Variable module provides a registry for meta-data about Drupal variables
-
-Group:	Applications/Publishing
-License: GPLv2+
-URL:	http://drupal.org/project/variable
-Source0: http://ftp.drupal.org/files/projects/variable-7.x-%{version}.tar.gz
-Source1: %{name}-fedora-README.txt
-Source2: %{name}-LICENSE.txt
-
-BuildArch: noarch
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: drupal7
+%{?drupal7_find_provides_and_requires}
+
+%global module_name variable
+
+Name:          drupal7-%{module_name}
+Version:       2.4
+Release:       1%{?dist}
+Summary:       Provides a registry for meta-data about Drupal variables
+
+Group:         Applications/Publishing
+License:       GPLv2+
+URL:           http://drupal.org/project/%{module_name}
+Source0:       http://ftp.drupal.org/files/projects/%{module_name}-7.x-%{version}.tar.gz
+Source1:       %{name}-RPM-README.txt
+
+BuildArch:     noarch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: drupal7-rpmbuild >= 7.23-3
+
+# phpcompatinfo (computed from version 2.4)
+Requires:      php-pcre
 
 %description
 Variable module provides a registry for meta-data about Drupal variables
@@ -24,19 +29,21 @@ control and uninstall for free.
 
 
 %prep
-%setup -qn variable
+%setup -qn %{module_name}
+cp -p %{SOURCE1} .
 
-install -p -m 0644 %{SOURCE1} .
+# Remove executable bit
+chmod -x LICENSE.txt
 
 
 %build
-cp %{SOURCE2} ./LICENSE.txt
+# Empty build section, nothing to build
 
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/variable
-cp -pr * %{buildroot}%{drupaldir}/modules/variable
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module_name}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module_name}/
 
 
 %clean
@@ -45,12 +52,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt README.txt %{name}-fedora-README.txt
-%{drupaldir}/modules/variable
-
+%doc *.txt
+%{drupal7_modules}/%{module_name}
+%exclude %{drupal7_modules}/%{module_name}/*.txt
 
 
 %changelog
+* Sat Jan 25 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.4-1
+- Updated to 2.4 (BZ #1056423; release notes https://drupal.org/node/2178137)
+- Spec cleanup
+
 * Sat Aug 10 2013 Peter Borsa <peter.borsa at gmail.com> - 2.3-1
 - Update to upstream 2.3 release for bug fixes
 - Upstream changelog for this release is available at https://drupal.org/node/2061163
@@ -67,7 +78,7 @@ rm -rf %{buildroot}
 * Thu Jul 12 2012 Scott Dodson <sdodson at redhat.com> - 2.1-0
 - Update to 2.1 BZ837246
 
-* Wed Jun 26 2012 Scott Dodson <sdodson at redhat.com> - 2.0-1
+* Tue Jun 26 2012 Scott Dodson <sdodson at redhat.com> - 2.0-1
 - Update to 2.0 BZ834183
 
 * Wed Apr 25 2012 Scott Dodson <sdodson at redhat.com> - 1.2-1
diff --git a/sources b/sources
index 42fb1f3..bbd07ff 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 4a053c4479a0a540225dc040e822b6ac  variable-7.x-2.3.tar.gz
+593343d361833c14f6bf8da3cc93332c  variable-7.x-2.4.tar.gz