[globus-gass-copy/el5] Implement updated license packaging guidelines

[Mattias Ellert]

commit 64cc45eb157887da2308fcff1cb6b2be01c08713
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jan 27 16:56:55 2015 +0100

    Implement updated license packaging guidelines
    
    - Set GLOBUS_HOSTNAME during make check and enable tests on EPEL5 and EPEL6

 globus-gass-copy.spec |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/globus-gass-copy.spec b/globus-gass-copy.spec
index a2d56cf..0053748 100644
--- a/globus-gass-copy.spec
+++ b/globus-gass-copy.spec
@@ -3,7 +3,7 @@
 Name:		globus-gass-copy
 %global _name %(tr - _ <<< %{name})
 Version:	9.13
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Gass Copy
 
 Group:		System Environment/Libraries
@@ -107,7 +107,7 @@ export GLOBUS_VERSION=6.0
 	   --docdir=%{_pkgdocdir}
 
 # Reduce overlinking
-sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
+sed 's!CC \(.*-shared\) !CC \\\${wl}--as-needed \1 !' -i libtool
 
 make %{?_smp_mflags}
 
@@ -121,11 +121,11 @@ rm %{buildroot}%{_libdir}/*.la
 # Install README file
 install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
+# Remove license file from pkgdocdir if licensedir is used
+%{?_licensedir: rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE}
+
 %check
-# Checks fail in koji for EPEL5 and EPEL6
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
-make %{?_smp_mflags} check VERBOSE=1
-%endif
+GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1
 
 %clean
 rm -rf %{buildroot}
@@ -137,8 +137,9 @@ rm -rf %{buildroot}
 %files
 %{_libdir}/libglobus_gass_copy.so.*
 %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
+%{!?_licensedir: %doc %{_pkgdocdir}/GLOBUS_LICENSE}
+%{?_licensedir: %license GLOBUS_LICENSE}
 
 %files progs
 %{_bindir}/globus-url-copy
@@ -152,11 +153,16 @@ rm -rf %{buildroot}
 %files doc
 %doc %{_mandir}/man3/*
 %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %dir %{_pkgdocdir}/html
 %doc %{_pkgdocdir}/html/*
+%{!?_licensedir: %doc %{_pkgdocdir}/GLOBUS_LICENSE}
+%{?_licensedir: %license GLOBUS_LICENSE}
 
 %changelog
+* Fri Jan 23 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.13-2
+- Implement updated license packaging guidelines
+- Set GLOBUS_HOSTNAME during make check and enable tests on EPEL5 and EPEL6
+
 * Thu Nov 13 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.13-1
 - GT6 update