[globus-ftp-control/el5] Implement updated license packaging guidelines

[Mattias Ellert]

commit 596a2ca374ffb2c25bf7d772060ab5232f2383fd
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jan 27 16:44:45 2015 +0100

    Implement updated license packaging guidelines
    
    - GT6 update (test fixes, missing return value)
    - Set GLOBUS_HOSTNAME during make check

 globus-ftp-control.spec |   20 +++++++++++++++-----
 sources                 |    2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/globus-ftp-control.spec b/globus-ftp-control.spec
index 87476cb..03be019 100644
--- a/globus-ftp-control.spec
+++ b/globus-ftp-control.spec
@@ -2,7 +2,7 @@
 
 Name:		globus-ftp-control
 %global _name %(tr - _ <<< %{name})
-Version:	6.3
+Version:	6.6
 Release:	1%{?dist}
 Summary:	Globus Toolkit - GridFTP Control Library
 
@@ -83,7 +83,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}
 
@@ -97,8 +97,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
-make %{?_smp_mflags} check VERBOSE=1
+GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1
 
 %clean
 rm -rf %{buildroot}
@@ -110,8 +113,9 @@ rm -rf %{buildroot}
 %files
 %{_libdir}/libglobus_ftp_control.so.*
 %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
+%{!?_licensedir: %doc %{_pkgdocdir}/GLOBUS_LICENSE}
+%{?_licensedir: %license GLOBUS_LICENSE}
 
 %files devel
 %{_includedir}/globus/*
@@ -121,11 +125,17 @@ 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> - 6.6-1
+- Implement updated license packaging guidelines
+- GT6 update (test fixes, missing return value)
+- Set GLOBUS_HOSTNAME during make check
+
 * Thu Nov 13 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.3-1
 - GT6 update
 - Drop patches globus-ftp-control-memleak.patch and
diff --git a/sources b/sources
index b48a380..bdc97a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49d9394ea2567127b8fbaf82f9d37cc8  globus_ftp_control-6.3.tar.gz
+6d0d8a2975059e4aeffd43f9bcb10a1b  globus_ftp_control-6.6.tar.gz