[globus-usage/el5] Implement updated license packaging guidelines

[Mattias Ellert]

commit 705f3090aa134fd7f706d5f7c0219a5b8caa0916
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jan 27 19:25:19 2015 +0100

    Implement updated license packaging guidelines

 globus-usage.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/globus-usage.spec b/globus-usage.spec
index 1b17ee2..8852642 100644
--- a/globus-usage.spec
+++ b/globus-usage.spec
@@ -3,7 +3,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	4.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -56,7 +56,7 @@ export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
 	   --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}
 
@@ -70,6 +70,9 @@ 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}
+
 %clean
 rm -rf %{buildroot}
 
@@ -80,8 +83,9 @@ rm -rf %{buildroot}
 %files
 %{_libdir}/libglobus_usage.so.*
 %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
+%{!?_licensedir: %doc %{_pkgdocdir}/GLOBUS_LICENSE}
+%{?_licensedir: %license GLOBUS_LICENSE}
 
 %files devel
 %{_includedir}/globus/*
@@ -89,6 +93,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Jan 23 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.4-2
+- Implement updated license packaging guidelines
+
 * Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.4-1
 - Update to Globus Toolkit 6.0
 - Drop GPT build system and GPT packaging metadata