[drupal6-filefield] Update to 3.10 and fix spec file (#696991)

[Paul W. Frields]

commit 90dd36d0ac83bbfc53f9658863a15cb56617aa02
Author: Paul W. Frields <stickster at gmail.com>
Date:   Sun Aug 7 13:19:58 2011 -0400

    Update to 3.10 and fix spec file (#696991)

 .gitignore                            |    1 +
 drupal6-filefield-3.10-1.fc17.src.rpm |  Bin 0 -> 59334 bytes
 drupal6-filefield-fedora-README.txt   |    6 ++++++
 drupal6-filefield.spec                |   20 ++++++++++++++------
 sources                               |    2 +-
 5 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49de935..5b01520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /filefield-6.x-3.9.tar.gz
+/filefield-6.x-3.10.tar.gz
diff --git a/drupal6-filefield-3.10-1.fc17.src.rpm b/drupal6-filefield-3.10-1.fc17.src.rpm
new file mode 100644
index 0000000..f368784
Binary files /dev/null and b/drupal6-filefield-3.10-1.fc17.src.rpm differ
diff --git a/drupal6-filefield-fedora-README.txt b/drupal6-filefield-fedora-README.txt
new file mode 100644
index 0000000..0e23730
--- /dev/null
+++ b/drupal6-filefield-fedora-README.txt
@@ -0,0 +1,6 @@
+After installation, you must enable this module from the drupal
+administration.
+
+If upgrading this module seperately from the core drupal package, 
+be sure to run the http://hostname/drupal/upgrade.php script after this
+rpm is upgraded.
diff --git a/drupal6-filefield.spec b/drupal6-filefield.spec
index 114ae81..b0bf30b 100644
--- a/drupal6-filefield.spec
+++ b/drupal6-filefield.spec
@@ -1,23 +1,25 @@
 %global drupalver 6
-%if 0%{?fedora} <= 14
-%global drupal drupal
-%else
-# e.g. "drupal6"
+%{?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
 
+# Bump epoch since old release illegally started with '6.x'
+Epoch:   1
 Name:    drupal6-%{modname}
-Version: 6.x.3.9
+Version: 3.10
 Release: 1%{?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/filefield-6.x-3.9.tar.gz
+Source0: http://ftp.drupal.org/files/projects/%{modname}-%{drupalver}.x-%{version}.tar.gz
+Source1: %{name}-fedora-README.txt
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  %{drupal} >= 6.0
@@ -32,6 +34,7 @@ your own site.
 %setup -qn %{modname}
 
 %build
+cp %{SOURCE1} .
 
 %install
 rm -rf %{buildroot}
@@ -45,8 +48,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc LICENSE.txt 
 %exclude %{drupaldir}/modules/%{modname}/LICENSE.txt
+%exclude %{drupaldir}/modules/%{modname}/%{name}-fedora-README.txt
 %{drupaldir}/modules/%{modname}
 
 %changelog
+* Sun Aug  7 2011 Paul W. Frields <stickster at gmail.com> - 1:3.10-1
+- Bump epoch and use legal version (#696991)
+- Update to upstream 3.10
+
 * Sat Mar 05 2011 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 6.x.3.9-1
 - New package
diff --git a/sources b/sources
index b1ab73a..a7a20d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43aff980408beff7d8f5554282aad15b  filefield-6.x-3.9.tar.gz
+66c61289be87affe9c7d4d5d48541ff3  filefield-6.x-3.10.tar.gz