[drupal7-ds] Updated to 2.7 (BZ #1159477)

[Shawn Iwinski]

commit 87193297b7e24a607a0747a6b825eb69623223f2
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Nov 9 23:28:59 2014 -0500

    Updated to 2.7 (BZ #1159477)
    
    - Removed RPM README b/c it only explained common Drupal workflow
    - %license usage

 .gitignore                |    1 +
 drupal7-ds-RPM-README.txt |    5 ----
 drupal7-ds.spec           |   50 ++++++++++++++++++++++++--------------------
 sources                   |    2 +-
 4 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a94087..c60eda1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /ds-7.x-2.4.tar.gz
 /ds-7.x-2.6.tar.gz
+/ds-7.x-2.7.tar.gz
diff --git a/drupal7-ds.spec b/drupal7-ds.spec
index 9244c86..5b703e4 100644
--- a/drupal7-ds.spec
+++ b/drupal7-ds.spec
@@ -1,25 +1,24 @@
 %{?drupal7_find_provides_and_requires}
 
-%global module_name ds
+%global module ds
 
-Name:          drupal7-%{module_name}
-Version:       2.6
-Release:       2%{?dist}
+Name:          drupal7-%{module}
+Version:       2.7
+Release:       1%{?dist}
 Summary:       Extend the display options for every entity type
 
 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
+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.22-5
+BuildRequires: drupal7-rpmbuild >= 7.23-3
 
 Requires:      drupal7-ctools
 #Requires:      drupal7(ctools)
-# phpci
+# phpcompatinfo (computed from version 2.7)
 Requires:      php-pcre
 
 %description
@@ -36,18 +35,17 @@ results, the full node, views etc.
 Watch a screen-cast (http://drupal.org/node/644706) to see it all in action!
 
 This package provides the following Drupal modules:
-* %{module_name}
-* %{module_name}_ui
-* %{module_name}_devel (NOTE: Requires install of the devel module)
-* %{module_name}_format
-* %{module_name}_extras
-* %{module_name}_search
-* %{module_name}_forms
+* %{module}
+* %{module}_ui
+* %{module}_devel (NOTE: Requires install of the devel module)
+* %{module}_format
+* %{module}_extras
+* %{module}_search
+* %{module}_forms
 
 
 %prep
-%setup -q -n %{module_name}
-cp -p %{SOURCE1} .
+%setup -qn %{module}
 
 
 %build
@@ -56,8 +54,8 @@ cp -p %{SOURCE1} .
 
 %install
 rm -rf %{buildroot}
-mkdir -p -m 0755 %{buildroot}%{drupal7_modules}/%{module_name}
-cp -pr * %{buildroot}%{drupal7_modules}/%{module_name}/
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
 
 
 %clean
@@ -66,12 +64,18 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc *.txt
-%{drupal7_modules}/%{module_name}
-%exclude %{drupal7_modules}/%{module_name}/*.txt
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.txt
+%doc README.txt
+%{drupal7_modules}/%{module}
 
 
 %changelog
+* Sun Nov 09 2014 Shawn Iwinski <shawn.iwinski at gmail.com> 2.7-1
+- Updated to 2.7 (BZ #1159477)
+- 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.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index fa455bd..165c4bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c064706a88b5b68f5afbf1301cb88888  ds-7.x-2.6.tar.gz
+2d3c2a0d46bcaf49abedce49e35f3852  ds-7.x-2.7.tar.gz