[drupal6-image_resize_filter: 2/2] Updated to 1.14 (BZ #1064727)

[Shawn Iwinski]

commit a5b3c54a9eaaeff367879b3eefc464c0051f1afc
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Sat Feb 15 00:09:30 2014 -0500

    Updated to 1.14 (BZ #1064727)
    
    - Release notes: https://drupal.org/node/2194065)
    - Security BZ #1064856, #1064857
    - SA-CONTRIB-2014-017 (https://drupal.org/node/2194655)
    - Spec cleanup

 .gitignore                                    |    1 +
 LICENSE.txt                                   |  280 -------------------------
 drupal6-image_resize_filter-RPM-README.txt    |    5 +
 drupal6-image_resize_filter-fedora-README.txt |    6 -
 drupal6-image_resize_filter.spec              |   91 +++++----
 sources                                       |    1 +
 6 files changed, 60 insertions(+), 324 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index efd6c68..dc5bfc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /image_resize_filter-6.x-1.13.tar.gz
+/image_resize_filter-6.x-1.14.tar.gz
diff --git a/drupal6-image_resize_filter-RPM-README.txt b/drupal6-image_resize_filter-RPM-README.txt
new file mode 100644
index 0000000..a098b41
--- /dev/null
+++ b/drupal6-image_resize_filter-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/drupal6/upgrade.php script after this RPM is upgraded.
diff --git a/drupal6-image_resize_filter.spec b/drupal6-image_resize_filter.spec
index 9901953..2380cdf 100644
--- a/drupal6-image_resize_filter.spec
+++ b/drupal6-image_resize_filter.spec
@@ -1,64 +1,79 @@
-%global drupalver 6
-%{?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 drupalbase           %{_datadir}/%{drupal}
-%global drupal_sites_all    %{drupalbase}/sites/all        
-%global drupal_modules      %{drupal_sites_all}/modules
-# Use upstream name as expressed in URL and tarball
-%global modname             image_resize_filter
-
-Name:    drupal%{drupalver}-%{modname}
-Version: 1.13
-Release: 3%{?dist}
-Summary: Image Resize Filter Module for Drupal6
-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
+%{!?drupal6:         %global drupal6         %{_datadir}/drupal6}
+%{!?drupal6_modules: %global drupal6_modules %{drupal6}/sites/all/modules}
+
+%global module image_resize_filter
+
+Name:      drupal6-%{module}
+Version:   1.14
+Release:   1%{?dist}
+Summary:   Filter to automatically scale images to their height and width dimensions
+
+Group:     Applications/Publishing
+License:   GPLv2+
+URL:       http://drupal.org/project/%{module}
+Source0:   http://ftp.drupal.org/files/projects/%{module}-6.x-%{version}.tar.gz
+Source1:   %{name}-RPM-README.txt
+
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Requires:  drupal6
+# phpcompatinfo (computed from version 1.14)
+Requires:  php-pcre
+
+Provides:  drupal6(%{module}) = %{version}
 
 %description
-This filter makes it easy to resize images, especially when combined with a 
-WYSIWYG editor such as tinyMCE or CKeditor.
+This filter makes it easy to resize images, especially when combined with a
+WYSIWYG editor such as tinyMCE or CKeditor. Users never have to worry about
+scaling image sizes again, just insert an image and set it's height and width
+properties in HTML (this is done automatically by WYSIWYG editors) and the
+image is resized on output to match the HTML.
+
+This package provides the following Drupal module:
+* %{module}
+
 
 %prep
-%setup -qn %{modname}
+%setup -qn %{module}
+
+cp -p %{SOURCE1} .
+
+# Remove executable bit
+chmod a-x LICENSE.txt
+
 
 %build
-cp %{SOURCE1} .
-cp %{SOURCE2} .
+# Empty build section, nothing required
 
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupal_modules}/%{modname}
-find . -type f -exec install -m 0644 -D '{}' %{buildroot}%{drupal_modules}/%{modname}/'{}' \;
+mkdir -pm 0755 %{buildroot}%{drupal6_modules}/%{module}
+cp -pr * %{buildroot}%{drupal6_modules}/%{module}/
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-# Remember to include other documentation text here as well
-%doc  %{name}-fedora-README.txt
-%doc  LICENSE.txt
-# Remember to exclude all documentation texts from above
-%exclude %{drupal_modules}/%{modname}/LICENSE.txt
-%exclude %{drupal_modules}/%{modname}/%{name}-fedora-README.txt
-%{drupal_modules}/%{modname}
+%doc *.txt
+%{drupal6_modules}/%{module}
+%exclude %{drupal6_modules}/%{module}/*.txt
+
 
 %changelog
+* Sat Feb 15 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.14-1
+- Updated to 1.14 (BZ #1064727; release notes https://drupal.org/node/2194065)
+- Security BZ #1064856, #1064857
+- SA-CONTRIB-2014-017 (https://drupal.org/node/2194655)
+- Spec cleanup
+
 * Thu Jun 7 2012 Anderson Silva <ansilva at redhat.com> - 1.13-3
 - Update description
-- Update LICENSE.txt with FSF mailing address 
+- Update LICENSE.txt with FSF mailing address
 
 * Fri Mar 9 2012 Anderson Silva <ansilva at redhat.com> - 1.13-2
 - Update spec to comply with Fedora Packaging
diff --git a/sources b/sources
index 88933bc..49cb319 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 4fcb782b9fbb37cca33157749ad0c147  image_resize_filter-6.x-1.13.tar.gz
+58a4214776fcd555da24a13328a53727  image_resize_filter-6.x-1.14.tar.gz