[drupal7-login_destination] Updated to 1.1 (BZ #1059997)

[Shawn Iwinski]

commit bc38858c5199c14c6e49ea3fe71b816a337638b3
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Sat Feb 15 15:26:32 2014 -0500

    Updated to 1.1 (BZ #1059997)
    
    - Release notes: https://drupal.org/node/1869598
    - Spec cleanup

 .gitignore                                  |    1 +
 LICENSE.txt                                 |  339 ---------------------------
 drupal7-login_destination-RPM-README.txt    |    5 +
 drupal7-login_destination-fedora-README.txt |    5 -
 drupal7-login_destination.spec              |   80 ++++---
 sources                                     |    1 +
 6 files changed, 54 insertions(+), 377 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 39e0b95..a3c2223 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /login_destination-7.x-1.0.tar.gz
+/login_destination-7.x-1.1.tar.gz
diff --git a/drupal7-login_destination-RPM-README.txt b/drupal7-login_destination-RPM-README.txt
new file mode 100644
index 0000000..e15a506
--- /dev/null
+++ b/drupal7-login_destination-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-login_destination.spec b/drupal7-login_destination.spec
index 4f123e5..fed4359 100644
--- a/drupal7-login_destination.spec
+++ b/drupal7-login_destination.spec
@@ -1,27 +1,24 @@
-%global drupalver 7
-%{?rhel: %{expand: %%global drupal drupal%%{drupalver}}}
-%if 0%{?fedora} >= 15
-%global drupal drupal%{drupalver}
-%endif
-%{!?drupal: %{expand: %%global drupal drupal}}
-# e.g. "/usr/share/drupal6"
-%global drupaldir %{_datadir}/%{drupal}
-# Use upstream name as expressed in URL and tarball
-%global modname login_destination
-
-Name:    drupal%{drupalver}-%{modname}
-Version: 1.0
-Release: 5%{?dist}
-Summary: Customize login landing page in Drupal %{drupalver}
-Group:   Applications/Publishing
-License: GPLv2+
-URL:     http://drupal.org/project/%{modname}
-Source0: http://ftp.drupal.org/files/projects/%{modname}-%{drupalver}.x-%{version}.tar.gz
-Source1: %{name}-fedora-README.txt
-Source2: LICENSE.txt
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  %{drupal} >= 7.0
+%{?drupal7_find_provides_and_requires}
+
+%global module login_destination
+
+Name:          drupal7-%{module}
+Version:       1.1
+Release:       1%{?dist}
+Summary:       Customize the destination that the user is redirected to after login
+
+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
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: drupal7-rpmbuild >= 7.23-3
+
+# phpcompatinfo (computed from version 1.1)
+Requires:      php-pcre
 
 %description
 The Login Destination module allows you to customize the destination
@@ -32,30 +29,47 @@ depend upon them. You may use PHP snippets to provide custom
 conditions and destinations. It also possible to keep users on the
 currently visited page after logging in or out.
 
+This package provides the following Drupal module:
+* %{module}
+
+
 %prep
-%setup -qn %{modname}
+%setup -qn %{module}
+cp -p %{SOURCE1} .
+
+# Remove executable bits
+find . -type f -perm /+x -print0 | xargs -0 chmod -x
+
+# Fix wrong-file-end-of-line-encoding
+sed -i 's/\r$//' README.txt
+
 
 %build
-cp %{SOURCE1} .
-cp %{SOURCE2} .
+# Empty build section, nothing to build
+
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/%{modname}
-find . -type f -exec install -m 0644 -D '{}' %{buildroot}%{drupaldir}/modules/%{modname}/'{}' \;
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
 
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt %{name}-fedora-README.txt
-%exclude %{drupaldir}/modules/%{modname}/LICENSE.txt
-%exclude %{drupaldir}/modules/%{modname}/%{name}-fedora-README.txt
-%{drupaldir}/modules/%{modname}
+%doc *.txt
+%{drupal7_modules}/%{module}
+%exclude %{drupal7_modules}/%{module}/*.txt
+
 
 %changelog
+* Sat Feb 15 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.1-1
+- Updated to 1.1 (BZ #1059997; release notes https://drupal.org/node/1869598)
+- Spec cleanup
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 53e7cd9..12ad309 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 a86d6cbe60b787b60f44f217e64fb93f  login_destination-7.x-1.0.tar.gz
+3a2b2bbfad270c363194221dba667a2b  login_destination-7.x-1.1.tar.gz