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

[Mattias Ellert]

commit 903739d7d0e33b265a4baead47d8d04f9be8da86
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jan 27 17:54:54 2015 +0100

    Implement updated license packaging guidelines

 globus-gram-job-manager-slurm.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/globus-gram-job-manager-slurm.spec b/globus-gram-job-manager-slurm.spec
index 3b36ee8..9c446e3 100644
--- a/globus-gram-job-manager-slurm.spec
+++ b/globus-gram-job-manager-slurm.spec
@@ -3,7 +3,7 @@
 Name:		globus-gram-job-manager-slurm
 %global _name %(tr - _ <<< %{name})
 Version:	2.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - SLURM Job Manager Support
 
 Group:		Applications/Internet
@@ -60,6 +60,10 @@ rm %{buildroot}/etc/grid-services/jobmanager-slurm
 # Install README file
 install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
+# Remove license files from pkgdocdir if licensedir is used
+%{?_licensedir: rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE}
+%{?_licensedir: rm %{buildroot}%{_pkgdocdir}/LICENSE*}
+
 %clean
 rm -rf %{buildroot}
 
@@ -77,11 +81,15 @@ fi
 %config(noreplace) %{_sysconfdir}/globus/globus-slurm.conf
 %config(noreplace) %{_sysconfdir}/grid-services/available/jobmanager-slurm-poll
 %dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
-%doc %{_pkgdocdir}/LICENSE*
 %doc %{_pkgdocdir}/README
+%{!?_licensedir: %doc %{_pkgdocdir}/GLOBUS_LICENSE}
+%{!?_licensedir: %doc %{_pkgdocdir}/LICENSE*}
+%{?_licensedir: %license GLOBUS_LICENSE LICENSE*}
 
 %changelog
+* Fri Jan 23 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-2
+- Implement updated license packaging guidelines
+
 * Thu Nov 13 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-1
 - GT6 update