[drupal7-field_permissions] Update to beta1

[Scott Dodson]

commit 29cebcd2b8a391da62c5f16b91bf2346d764899f
Author: Scott Dodson <sdodson at redhat.com>
Date:   Tue Dec 20 13:52:06 2011 -0500

    Update to beta1

 .gitignore                     |    1 +
 drupal7-field_permissions.spec |   33 +++++++++++++++++++++++----------
 sources                        |    2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea90a02..4745409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /field_permissions-7.x-1.0-alpha1.tar.gz
+/field_permissions-7.x-1.0-beta1.tar.gz
diff --git a/drupal7-field_permissions.spec b/drupal7-field_permissions.spec
index d80772e..c9ff9a2 100644
--- a/drupal7-field_permissions.spec
+++ b/drupal7-field_permissions.spec
@@ -1,13 +1,23 @@
-%define drupaldir %{_datadir}/drupal7
-Name:	drupal7-field_permissions
+%global drupalver 7
+%{?rhel: %{expand: %%global drupal drupal%%{drupalver}}}
+%if 0%{?fedora} >= 15
+%global drupal drupal%{drupalver}
+%endif
+%{!?drupal: %{expand: %%global drupal drupal}}
+# e.g. "/usr/share/drupal7"
+%global drupaldir %{_datadir}/%{drupal}
+# Use upstream name as expressed in URL and tarball
+%global modname field_permissions
+%global alphabeta -beta1
+
+Name:	%{drupal}-%{modname}
 Version:	1.0
-Release:	0.1.alpha1%{?dist}
+Release:	0.1.beta1%{?dist}
 Summary: A replacement for the Content Permissions module shipped with CCK
-
 Group:	Applications/Publishing	
 License: GPLv2+
-URL:	http://drupal.org/project/field_permissions
-Source0: http://ftp.drupal.org/files/projects/field_permissions-7.x-1.0-alpha1.tar.gz
+URL:	http://drupal.org/project/%{modname}
+Source0: http://ftp.drupal.org/files/projects/%{modname}-7.x-%{version}%{alphabeta}.tar.gz
 Source1: %{name}-fedora-README.txt
 Source2: LICENSE.txt
 
@@ -30,7 +40,7 @@ where this feature is needed.
 
 
 %prep
-%setup -qn field_permissions
+%setup -qn %{modname}
 
 install -p -m 0644 %{SOURCE1} .
 
@@ -40,8 +50,8 @@ cp %{SOURCE2} .
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/field_permissions
-cp -pr * %{buildroot}%{drupaldir}/modules/field_permissions
+install -d %{buildroot}%{drupaldir}/modules/%{modname}
+cp -pr * %{buildroot}%{drupaldir}/modules/%{modname}
 
 
 %clean
@@ -51,10 +61,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt README.txt %{name}-fedora-README.txt
-%{drupaldir}/modules/field_permissions
+%{drupaldir}/modules/%{modname}
 
 
 
 %changelog
+* Tue Dec 20 2011 Scott Dodson <sdodson at redhat.com> - 1.0-0.2.beta1
+- Update to 1.0-beta1
+- specfile cleanup
 * Fri Oct 28 2011 Scott Dodson <sdodson at redhat.com> - 1.0-0.1.alpha1
 - Initial Packaging
diff --git a/sources b/sources
index ffa4426..902e499 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1e871930df8545aaac04f29388fb3e1  field_permissions-7.x-1.0-alpha1.tar.gz
+a07fb8f2a0a296ff56a2b56965e04b20  field_permissions-7.x-1.0-beta1.tar.gz