[drupal6-video] Update to 4.2 and bump epoch for legal version number

[Paul W. Frields]

commit 67310dfe9995ff40a7c927af2369926eccf778b8
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Aug 8 19:34:07 2011 -0400

    Update to 4.2 and bump epoch for legal version number

 .gitignore                      |    1 +
 drupal6-video-fedora-README.txt |    6 ++++++
 drupal6-video.spec              |   37 +++++++++++++++++++++++--------------
 sources                         |    2 +-
 4 files changed, 31 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1849959..a9f4009 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /video-6.x-4.2-beta2.tar.gz
+/video-6.x-4.2.tar.gz
diff --git a/drupal6-video-fedora-README.txt b/drupal6-video-fedora-README.txt
new file mode 100644
index 0000000..0e23730
--- /dev/null
+++ b/drupal6-video-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-video.spec b/drupal6-video.spec
index f8f1eac..e303073 100644
--- a/drupal6-video.spec
+++ b/drupal6-video.spec
@@ -1,38 +1,41 @@
 %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 video
 
+# Use epoch since previous release had incorrect version
+Epoch:   1
 Name:    drupal6-%{modname}
-Version: 6.x.4.2.beta2
-Release: 2%{?dist}
-Summary: Allows Creation of CCK Video Fields
+Version: 4.2
+Release: 1%{?dist}
+Summary: Allows creation of CCK video fields
 Group:   Applications/Publishing
 License: GPLv2+
 URL:     http://drupal.org/project/%{modname}
-Source0: http://ftp.drupal.org/files/projects/video-6.x-4.2-beta2.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
 
 %description
-Video module allows you to upload video in any format, play video in any 
-format, transcode video to FLV using FFMPEG (can be extended to any 
-transcoder), automatically creates video thumbnails, use video thumbnails in 
-video node teaser, fast and very reliable API for converting videos and auto 
-thumbnailing, can be used as an all-in-one video solution for Drupal.
+Video module allows you to upload video in any format, play video in
+any format, transcode video, automatically create video thumbnails,
+use video thumbnails in video node teaser, fast and very reliable API
+for converting videos and auto thumbnailing, can be used as an
+all-in-one video solution for Drupal.
 
 %prep
 %setup -qn %{modname}
 
 %build
+cp %{SOURCE1} .
 
 %install
 rm -rf %{buildroot}
@@ -45,12 +48,18 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt
+%doc LICENSE.txt %{name}-fedora-README.txt
 %exclude %{drupaldir}/modules/%{modname}/LICENSE.txt
+%exclude %{drupaldir}/modules/%{modname}/%{name}-fedora-README.txt
 %{drupaldir}/modules/%{modname}
 
 %changelog
+* Mon Aug  8 2011 Paul W. Frields <stickster at gmail.com> - 1:4.2-1
+- Bump epoch to restore legal version number
+- Add README
+
 * Sun Mar 06 2011 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 6.x.4.2.beta2-2
 - Fixed package name.
+
 * Sat Mar 05 2011 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 6.x.4.2.beta2-1
 - New package.
diff --git a/sources b/sources
index 8f6d20b..2e49f73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c54574934aa75fccb21b044a8e8b54b0  video-6.x-4.2-beta2.tar.gz
+f0835f5a18ca64235d57c43254a2185d  video-6.x-4.2.tar.gz