[globus-gridftp-server/el5] Implement updated license packaging guidelines

[Mattias Ellert]

commit afe26dcb7492bb0d741c840749860a61317b8ddf
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jan 27 18:06:55 2015 +0100

    Implement updated license packaging guidelines
    
    - GT6 update (-help fix)

 globus-gridftp-server.spec |   14 +++++++++++---
 sources                    |    2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec
index 0312d8b..6381fbf 100644
--- a/globus-gridftp-server.spec
+++ b/globus-gridftp-server.spec
@@ -6,7 +6,7 @@
 
 Name:		globus-gridftp-server
 %global _name %(tr - _ <<< %{name})
-Version:	7.18
+Version:	7.20
 Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GridFTP Server
 
@@ -110,7 +110,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}
 
@@ -146,6 +146,9 @@ install -m 644 -p %{SOURCE3} %{SOURCE4} %{buildroot}%{_mandir}/man8
 # 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}
 
@@ -174,8 +177,9 @@ fi
 %files
 %{_libdir}/libglobus_gridftp_server.so.*
 %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
+%{!?_licensedir: %doc %{_pkgdocdir}/GLOBUS_LICENSE}
+%{?_licensedir: %license GLOBUS_LICENSE}
 
 %files progs
 %{_sbindir}/gfs-dynbe-client
@@ -199,6 +203,10 @@ fi
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Jan 23 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.20-1
+- Implement updated license packaging guidelines
+- GT6 update (-help fix)
+
 * Wed Jan 07 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.18-1
 - GT6 update (net mgr support)
 
diff --git a/sources b/sources
index 7aaaa0f..c77550b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-599b8807bc593c39bfb2bac745afc2ee  globus_gridftp_server-7.18.tar.gz
+602b0b89bffbb4f9878474d0e1130ac4  globus_gridftp_server-7.20.tar.gz