[globus-gram-job-manager-fork/el5] Implement updated license packaging guidelines

[Mattias Ellert]

commit 41db056b7fe12aa9a83e95b7f17d29470642d177
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jan 27 17:37:25 2015 +0100

    Implement updated license packaging guidelines

 globus-gram-job-manager-fork.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/globus-gram-job-manager-fork.spec b/globus-gram-job-manager-fork.spec
index 417bf50..a7ce37e 100644
--- a/globus-gram-job-manager-fork.spec
+++ b/globus-gram-job-manager-fork.spec
@@ -3,7 +3,7 @@
 Name:		globus-gram-job-manager-fork
 %global _name %(tr - _ <<< %{name})
 Version:	2.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Fork Job Manager Support
 
 Group:		Applications/Internet
@@ -102,7 +102,7 @@ export MPIRUN=no
 	   --with-globus-state-dir=%{_localstatedir}/log/globus
 
 # 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}
 
@@ -119,6 +119,9 @@ rm %{buildroot}/etc/grid-services/jobmanager-fork
 # 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}
 
@@ -150,13 +153,15 @@ fi
 %dir %{_sysconfdir}/globus
 %config(noreplace) %{_sysconfdir}/globus/globus-fork.conf
 %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
+%{!?_licensedir: %doc %{_pkgdocdir}/GLOBUS_LICENSE}
+%{?_licensedir: %license GLOBUS_LICENSE}
 
 %files setup-poll
 %config(noreplace) %{_sysconfdir}/grid-services/available/jobmanager-fork-poll
 
 %files setup-seg
+# This is a loadable module (plugin)
 %{_libdir}/libglobus_seg_fork.so
 %{_sbindir}/globus-fork-starter
 %doc %{_mandir}/man8/globus-fork-starter.8*
@@ -164,6 +169,9 @@ fi
 %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/fork
 
 %changelog
+* Fri Jan 23 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.4-2
+- Implement updated license packaging guidelines
+
 * Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.4-1
 - Update to Globus Toolkit 6.0
 - Drop GPT build system and GPT packaging metadata