[globus-gram-job-manager-lsf/el5] Implement updated license packaging guidelines
Mattias Ellert
ellert at fedoraproject.org
Tue Jan 27 16:41:12 UTC 2015
commit ba0199009259e1a7a3708eb1406482e6e7b59116
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Tue Jan 27 17:40:24 2015 +0100
Implement updated license packaging guidelines
globus-gram-job-manager-lsf.spec | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/globus-gram-job-manager-lsf.spec b/globus-gram-job-manager-lsf.spec
index 4990926..3460316 100644
--- a/globus-gram-job-manager-lsf.spec
+++ b/globus-gram-job-manager-lsf.spec
@@ -3,7 +3,7 @@
Name: globus-gram-job-manager-lsf
%global _name %(tr - _ <<< %{name})
Version: 2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - LSF Job Manager Support
Group: Applications/Internet
@@ -101,7 +101,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}
@@ -118,6 +118,9 @@ rm %{buildroot}/etc/grid-services/jobmanager-lsf
# 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}
@@ -149,18 +152,23 @@ fi
%{perl_vendorlib}/Globus/GRAM/JobManager/lsf.pm
%config(noreplace) %{_sysconfdir}/globus/globus-lsf.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-lsf-poll
%files setup-seg
+# This is a loadable module (plugin)
%{_libdir}/libglobus_seg_lsf.so
%config(noreplace) %{_sysconfdir}/grid-services/available/jobmanager-lsf-seg
%config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/lsf
%changelog
+* Fri Jan 23 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.6-2
+- Implement updated license packaging guidelines
+
* Mon Oct 27 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.6-1
- GT6 update
More information about the scm-commits
mailing list