[drupal6-filefield] Updated to 3.12 (BZ #1064729)

[Shawn Iwinski]

commit 23f4fde3d68ce3a360f474fd8300072b8728317a
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Fri Feb 14 23:51:16 2014 -0500

    Updated to 3.12 (BZ #1064729)
    
    - Release notes: https://drupal.org/node/2194103)
    - Security BZ #1064841, #1064842, 1064843
    - SA-CONTRIB-2014-015
    - Spec cleanup

 .gitignore                          |    1 +
 drupal6-filefield-RPM-README.txt    |    5 ++
 drupal6-filefield-fedora-README.txt |    6 --
 drupal6-filefield.spec              |   90 +++++++++++++++++++++++------------
 sources                             |    1 +
 5 files changed, 67 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a01b3a4..1517c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /filefield-6.x-3.9.tar.gz
 /filefield-6.x-3.10.tar.gz
 /filefield-6.x-3.11.tar.gz
+/filefield-6.x-3.12.tar.gz
diff --git a/drupal6-filefield-RPM-README.txt b/drupal6-filefield-RPM-README.txt
new file mode 100644
index 0000000..a098b41
--- /dev/null
+++ b/drupal6-filefield-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-filefield.spec b/drupal6-filefield.spec
index 8328f78..3487d7b 100644
--- a/drupal6-filefield.spec
+++ b/drupal6-filefield.spec
@@ -1,57 +1,87 @@
-%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 drupaldir %{_datadir}/%{drupal}
-# Use upstream name as expressed in URL and tarball
-%global modname filefield
+%{!?drupal6:         %global drupal6         %{_datadir}/drupal6}
+%{!?drupal6_modules: %global drupal6_modules %{drupal6}/sites/all/modules}
 
+%global module filefield
+
+Name:      drupal6-%{module}
+Version:   3.12
+Release:   1%{?dist}
 # Bump epoch since old release illegally started with '6.x'
-Epoch:   1
-Name:    drupal6-%{modname}
-Version: 3.11
-Release: 2%{?dist}
-Summary: Defines a file field type
-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
+Epoch:     1
+Summary:   Defines a file field type
+
+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:  %{drupal} >= 6.0
+
+Requires:  drupal6
+#Requires:  drupal6(content)
+# phpcompatinfo (computed from version 3.12)
+Requires:  php-date
+Requires:  php-ereg
+Requires:  php-gd
+Requires:  php-pcre
+
+Provides:  drupal6(%{module})      = %{version}
+Provides:  drupal6(%{module}_meta) = %{version}
 
 %description
-FileField provides a universal file upload field for CCK. It is a robust 
+FileField provides a universal file upload field for CCK. It is a robust
 alternative to core's Upload module and an absolute must for users uploading a
 large number of files. Great for managing video and audio files for podcasts on
 your own site.
 
+Optional:
+* APC (php-pecl-apcu)
+* uploadprogress (http://pecl.php.net/package/uploadprogress)
+
+This package provides the following Drupal modules:
+* %{module}
+* %{module}_meta
+
+
 %prep
-%setup -qn %{modname}
+%setup -qn %{module}
+
+cp -p %{SOURCE1} .
+
+# Remove executable bit
+chmod a-x LICENSE.txt
+
 
 %build
-cp %{SOURCE1} .
+# Empty build section, nothing required
+
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/%{modname}
-cp -pr * %{buildroot}%{drupaldir}/modules/%{modname}
+mkdir -pm 0755 %{buildroot}%{drupal6_modules}/%{module}
+cp -pr * %{buildroot}%{drupal6_modules}/%{module}/
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt 
-%exclude %{drupaldir}/modules/%{modname}/LICENSE.txt
-%exclude %{drupaldir}/modules/%{modname}/%{name}-fedora-README.txt
-%{drupaldir}/modules/%{modname}
+%doc *.txt
+%{drupal6_modules}/%{module}
+%exclude %{drupal6_modules}/%{module}/*.txt
+
 
 %changelog
+* Fri Feb 14 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1:3.12-1
+- Updated to 3.12 (BZ #1064729; release notes https://drupal.org/node/2194103)
+- Security BZ #1064841, #1064842, 1064843
+- SA-CONTRIB-2014-015
+- Spec cleanup
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b79ffa..bc5d876 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 8fdc10f1efe48886c7a56267692e698a  filefield-6.x-3.11.tar.gz
+ccd679a3f604dd8b181a6272017423b3  filefield-6.x-3.12.tar.gz