[drupal7-strongarm] Fixed non-versioned versus versioned doc dir issue

Shawn Iwinski siwinski at fedoraproject.org
Thu Nov 14 19:36:29 UTC 2013


commit 9e5616dae1509b4a7c9ecdee5d2ec2160deb1a04
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Thu Nov 14 14:36:48 2013 -0500

    Fixed non-versioned versus versioned doc dir issue

 drupal7-strongarm.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/drupal7-strongarm.spec b/drupal7-strongarm.spec
index 93e9a51..dccf015 100644
--- a/drupal7-strongarm.spec
+++ b/drupal7-strongarm.spec
@@ -2,7 +2,7 @@
 
 Name:    drupal7-strongarm
 Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Strongarm gives a way to override the default variable values
 
 Group: Applications/Publishing
@@ -38,8 +38,15 @@ cp -pr * %{buildroot}%{drupaldir}/modules/strongarm
 
 # Symlink README.txt for UI help
 rm -f %{buildroot}%{drupaldir}/modules/strongarm/README.txt
+%if 0%{?fedora} >= 20
+# Non-versioned doc dir
 ln -s %{_docdir}/%{name}/README.txt \
       %{buildroot}%{drupaldir}/modules/strongarm/README.txt
+%else
+# Versioned doc dir
+ln -s %{_docdir}/%{name}-%{version}/README.txt \
+      %{buildroot}%{drupaldir}/modules/strongarm/README.txt
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -52,6 +59,9 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/modules/strongarm/drupal7-strongarm-fedora-README.txt
 
 %changelog
+* Thu Nov 14 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.0-2
+- Fixed non-versioned versus versioned doc dir issue
+
 * Fri Nov 08 2013 Peter Borsa <peter.borsa at gmail.com> - 2.0-1
 - Update to upstream 2.0 release for bug fixes
 - Upstream changelog for this release: https://drupal.org/node/1632574


More information about the scm-commits mailing list