[drupal6-image] Fix spec file and bump epoch, using legal version (#696990)

[Paul W. Frields]

commit 25d6bdfa886756934c30a9c604d792579e9d473d
Author: Paul W. Frields <stickster at gmail.com>
Date:   Sun Aug 7 13:33:21 2011 -0400

    Fix spec file and bump epoch, using legal version (#696990)

 drupal6-image.spec |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/drupal6-image.spec b/drupal6-image.spec
index 9dd8792..c9cf195 100644
--- a/drupal6-image.spec
+++ b/drupal6-image.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 image
 
+# Use epoch since old release had illegal version
+Epoch:   1
 Name:    drupal6-%{modname}
-Version: 6.x.1.1
+Version: 1.1
 Release: 1%{?dist}
 Summary: Allows uploading, resizing and viewing of images
 Group:   Applications/Publishing
 License: GPLv2+
 URL:     http://drupal.org/project/%{modname}
-Source0: http://ftp.drupal.org/files/projects/image-6.x-1.1.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 @@ galleries.
 %setup -qn %{modname}
 
 %build
+cp %{SOURCE1} .
 
 %install
 rm -rf %{buildroot}
@@ -45,8 +48,12 @@ 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:1.1-1
+- Fix spec file and bump epoch, using legal version (#696990)
+
 * Sat Mar 05 2011 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 6.x.1.1-1
 - New package.