[globus-gsi-proxy-core/el5] Implement updated license packaging guidelines

[Mattias Ellert]

commit d981e2bcd91e5a3548b42b3d7ad0c49a5c5e93d4
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jan 27 18:43:45 2015 +0100

    Implement updated license packaging guidelines

 globus-gsi-proxy-core.spec |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/globus-gsi-proxy-core.spec b/globus-gsi-proxy-core.spec
index 9c9a3f8..6dbea95 100644
--- a/globus-gsi-proxy-core.spec
+++ b/globus-gsi-proxy-core.spec
@@ -3,7 +3,7 @@
 Name:		globus-gsi-proxy-core
 %global _name %(tr - _ <<< %{name})
 Version:	7.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy Core Library
 
 Group:		System Environment/Libraries
@@ -84,7 +84,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}
 
@@ -98,6 +98,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}
 
@@ -108,8 +111,9 @@ rm -rf %{buildroot}
 %files
 %{_libdir}/libglobus_gsi_proxy_core.so.*
 %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
+%{!?_licensedir: %doc %{_pkgdocdir}/GLOBUS_LICENSE}
+%{?_licensedir: %license GLOBUS_LICENSE}
 
 %files devel
 %{_includedir}/globus/*
@@ -119,11 +123,15 @@ 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> - 7.7-2
+- Implement updated license packaging guidelines
+
 * Mon Oct 27 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.7-1
 - GT6 update
 - Drop patch globus-gsi-proxy-core-doxygen.patch (fixed upstream)