[drupal7-rules] Updated to 2.8 (BZ #1180431)

[Shawn Iwinski]

commit 21f87aef9c1eb4b2cdf6e6d3bee5b026576fde64
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Tue Jan 13 19:54:04 2015 -0500

    Updated to 2.8 (BZ #1180431)
    
    - Spec cleanup
    - Removed RPM README b/c it only explained common Drupal workflow
    - %license usage

 .gitignore                      |    1 +
 LICENSE.txt                     |  339 ---------------------------------------
 drupal7-rules-fedora-README.txt |    6 -
 drupal7-rules.spec              |   88 +++++++----
 sources                         |    2 +-
 5 files changed, 60 insertions(+), 376 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 769e50b..4b840b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /rules-7.x-2.5.tar.gz
 /rules-7.x-2.6.tar.gz
 /rules-7.x-2.7.tar.gz
+/rules-7.x-2.8.tar.gz
diff --git a/drupal7-rules.spec b/drupal7-rules.spec
index f270b23..86e88db 100644
--- a/drupal7-rules.spec
+++ b/drupal7-rules.spec
@@ -1,54 +1,82 @@
-%global drupaldir %{_datadir}/drupal7
+%{?drupal7_find_provides_and_requires}
+
+%global module rules
+
+Name:          drupal7-%{module}
+Version:       2.8
+Release:       1%{?dist}
+Summary:       React on events and conditionally evaluate actions
+
+Group:         Applications/Publishing
+License:       GPLv2+
+URL:           http://drupal.org/project/%{module}
+Source0:       http://ftp.drupal.org/files/projects/%{module}-7.x-%{version}.tar.gz
+
+BuildArch:     noarch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: drupal7-rpmbuild >= 7.23-3
+
+# rules.info
+Requires:      drupal7(entity)
+Requires:      drupal7(entity_token)
+# phpcompatinfo (computed from version 2.8)
+Requires:      php-date
+Requires:      php-filter
+Requires:      php-pcre
+Requires:      php-reflection
+Requires:      php-spl
 
-Name:    drupal7-rules
-Version: 2.7
-Release: 2%{?dist}
-Summary: It allows site administrators to define conditionally executed actions
-
-Group: Applications/Publishing
-License: GPLv2+
-URL:     http://drupal.org/project/rules
-Source0: http://ftp.drupal.org/files/projects/rules-7.x-%{version}.tar.gz
-Source1: %{name}-fedora-README.txt
-Source2: LICENSE.txt
+%description
+The Rules module allows site administrators to define conditionally executed
+actions based on occurring events (known as reactive or ECA rules). It's a
+replacement with more features for the trigger module in core and the successor
+of the Drupal 5 workflow-ng module.
 
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  drupal7
-Requires:  drupal7-entity
+This package provides the following Drupal modules:
+* %{module}
+* %{module}_admin
+* %{module}_i18n
+* %{module}_scheduler
 
-%description
-The rules modules allows site administrators to define conditionally executed
-actions based on occurring events (known as reactive or ECA rules).
-It's a replacement with more features for the trigger module in core
-and the successor of the Drupal 5 workflow-ng module.
 
 %prep
+%setup -qn %{module}
+
+# E: script-without-shebang /usr/share/drupal7/modules/rules/includes/rules.event.inc
+chmod a-x includes/rules.event.inc
 
-%setup -qn rules
 
-install -p -m 0644 %{SOURCE1} .
-install -p -m 0644 %{SOURCE2} .
-find -type f -perm /111 | xargs chmod -x
 
 %build
+# Empty build section, nothing to build
 
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/rules
-cp -pr * %{buildroot}%{drupaldir}/modules/rules
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-%doc DEVELOPER.txt LICENSE.txt README.txt %{name}-fedora-README.txt
-%{drupaldir}/modules/rules
-%exclude %{drupaldir}/modules/rules/*.txt
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.txt
+%doc DEVELOPER.txt
+%doc README.txt
+%{drupal7_modules}/%{module}
+
 
 %changelog
+* Tue Jan 13 2015 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.8-1
+- Updated to 2.8 (BZ #1180431)
+- Spec cleanup
+- Removed RPM README b/c it only explained common Drupal workflow
+- %%license usage
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index a3f8f95..9cbe586 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f28b8811918dd16952acca967d09dcc0  rules-7.x-2.7.tar.gz
+c84d88caa5ba178efa689a1a71d3a144  rules-7.x-2.8.tar.gz