[drupal7-entity] Updated to 1.3

[Shawn Iwinski]

commit aad15a83b348d733ee592877d1acce5d61a9cf08
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Thu Jan 9 14:39:12 2014 -0500

    Updated to 1.3
    
    - Updated to 1.3 (release notes: https://drupal.org/node/2169589) (BZ #1050853)
    - CVE-2014-1398, CVE-2014-1399, CVE-2014-1400 (BZ #1050802, 1050803, 1050804)
    - SA-CONTRIB-2014-001 (https://drupal.org/node/2169595)
    - Spec cleanup

 drupal7-entity-LICENSE.txt       |  339 --------------------------------------
 drupal7-entity-RPM-README.txt    |    5 +
 drupal7-entity-fedora-README.txt |    6 -
 drupal7-entity.spec              |   61 +++++---
 4 files changed, 44 insertions(+), 367 deletions(-)
---
diff --git a/drupal7-entity-RPM-README.txt b/drupal7-entity-RPM-README.txt
new file mode 100644
index 0000000..e15a506
--- /dev/null
+++ b/drupal7-entity-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-entity.spec b/drupal7-entity.spec
index 207b42d..28b202b 100644
--- a/drupal7-entity.spec
+++ b/drupal7-entity.spec
@@ -1,20 +1,27 @@
-%define drupaldir %{_datadir}/drupal7
+%{?drupal7_find_provides_and_requires}
 
-Name:	drupal7-entity
-Version: 1.2
-Release: 1%{?dist}
-Summary: Extends the entity API to provide a unified way to deal with entities
+%global module_name entity
 
-Group:	Applications/Publishing	
-License: GPLv2+
-URL:	http://drupal.org/project/entity
-Source0: http://ftp.drupal.org/files/projects/entity-7.x-%{version}.tar.gz
-Source1: %{name}-fedora-README.txt
-Source2: %{name}-LICENSE.txt
+Name:          drupal7-%{module_name}
+Version:       1.3
+Release:       1%{?dist}
+Summary:       Extends the entity API to provide a unified way to deal with entities
 
-BuildArch: noarch
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: drupal7
+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 1.3)
+Requires:      php-date
+Requires:      php-pcre
+Requires:      php-pdo
+Requires:      php-spl
 
 %description
 This module extends the entity API of Drupal core in order to provide a unified
@@ -22,19 +29,23 @@ way to deal with entities and their properties. Additionally, it provides an
 entity CRUD controller, which helps simplifying the creation of new entity
 types.
 
+
 %prep
-%setup -qn entity
+%setup -q -n %{module_name}
+cp -p %{SOURCE1} .
 
-install -p -m 0644 %{SOURCE1} .
+# Remove executable bit
+chmod -x LICENSE.txt
 
 
 %build
-cp %{SOURCE2} .
+# Empty build section, nothing to build
+
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/entity
-cp -pr * %{buildroot}%{drupaldir}/modules/entity
+mkdir -p -m 0755 %{buildroot}%{drupal7_modules}/%{module_name}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module_name}/
 
 
 %clean
@@ -43,12 +54,18 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt README.txt %{name}-fedora-README.txt
-%{drupaldir}/modules/entity
-
+%doc *.txt
+%{drupal7_modules}/%{module_name}
+%exclude %{drupal7_modules}/%{module_name}/*.txt
 
 
 %changelog
+* Thu Jan 09 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.3-1
+- Updated to 1.3 (release notes: https://drupal.org/node/2169589) (BZ #1050853)
+- CVE-2014-1398, CVE-2014-1399, CVE-2014-1400 (BZ #1050802, 1050803, 1050804)
+- SA-CONTRIB-2014-001 (https://drupal.org/node/2169595)
+- Spec cleanup
+
 * Fri Aug 16 2013 Peter Borsa <peter.borsa at gmail.com> - 1.2-1
 - Update to upstream 1.2 release for security and bug fixes
 - Upstream changelog for this release is available at https://drupal.org/node/2065197