[drupal6-yubikey] Bump epoch and move to correct version number
Paul W. Frields
pfrields at fedoraproject.org
Mon Aug 8 23:42:46 UTC 2011
commit 3325883d4cd9a4bdd93f4927de87734ca704341b
Author: Paul W. Frields <stickster at gmail.com>
Date: Mon Aug 8 19:42:11 2011 -0400
Bump epoch and move to correct version number
drupal6-yubikey-fedora-README.txt | 6 ++++++
drupal6-yubikey.spec | 21 ++++++++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/drupal6-yubikey-fedora-README.txt b/drupal6-yubikey-fedora-README.txt
new file mode 100644
index 0000000..0e23730
--- /dev/null
+++ b/drupal6-yubikey-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-yubikey.spec b/drupal6-yubikey.spec
index f24f41c..c9d5d5d 100644
--- a/drupal6-yubikey.spec
+++ b/drupal6-yubikey.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 yubikey
+# Use epoch due to previous illegal version number
+Epoch: 1
Name: drupal6-%{modname}
-Version: 6.x.2.0.beta2
-Release: 1%{?dist}
+Version: 2.0
+Release: 0.1.beta2%{?dist}
Summary: Provides YubiKey based strong two-factor user authentication capabilities
Group: Applications/Publishing
License: GPLv2+
URL: http://drupal.org/project/%{modname}
Source0: http://ftp.drupal.org/files/projects/yubikey-6.x-2.0-beta2.tar.gz
+Source1: %{name}-fedora-README.txt
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{drupal} >= 6.0
@@ -35,6 +37,7 @@ even over insecure connections.
%setup -qn %{modname}
%build
+cp %{SOURCE1} .
%install
rm -rf %{buildroot}
@@ -46,10 +49,14 @@ 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:2.0-0.1.beta2
+- Bump epoch and move to correct version number
+
* Wed Mar 02 2011 Eric "Sparks" Christensen - 6.x.2.0.beta2-1
- Initial package
More information about the scm-commits
mailing list