[globus-gram-job-manager-lsf/el5: 5/5] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Thu Sep 18 19:58:01 UTC 2014
commit a5eb32743d2366fc940d90b12e56880cd6c3867a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Sep 18 21:57:15 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
- Drop patch globus-gram-job-manager-lsf-statedir.patch (fixed upstream)
globus-gram-job-manager-lsf-statedir.patch | 19 -----
globus-gram-job-manager-lsf.spec | 102 ++++++++-------------------
sources | 2 +-
3 files changed, 31 insertions(+), 92 deletions(-)
---
diff --git a/globus-gram-job-manager-lsf.spec b/globus-gram-job-manager-lsf.spec
index d3f8209..e207644 100644
--- a/globus-gram-job-manager-lsf.spec
+++ b/globus-gram-job-manager-lsf.spec
@@ -1,46 +1,30 @@
-%ifarch aarch64 alpha ia64 %{power64} s390x sparc64 x86_64
-%global flavor gcc64
-%else
-%global flavor gcc32
-%endif
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
-
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: globus-gram-job-manager-lsf
%global _name %(tr - _ <<< %{name})
-Version: 1.2
-Release: 6%{?dist}
+Version: 2.5
+Release: 1%{?dist}
Summary: Globus Toolkit - LSF Job Manager Support
Group: Applications/Internet
License: ASL 2.0
URL: http://www.globus.org/
-Source: http://www.globus.org/ftppub/gt5/5.2/5.2.5/packages/src/%{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-GRAM5
-# Missing configure option
-# http://jira.globus.org/browse/GT-493
-Patch0: %{name}-statedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-gram-job-manager >= 13
Requires: globus-gram-job-manager-scripts >= 4
Requires: globus-gass-cache-program >= 5
-Requires: globus-common-progs >= 14
Requires: globus-gatekeeper >= 9
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-Requires: %{name}-setup
+Requires: %{name}-setup = %{version}-%{release}
Provides: globus-gram-job-manager-setup-lsf = 2.6
Obsoletes: globus-gram-job-manager-setup-lsf < 2.6
Obsoletes: globus-gram-job-manager-setup-lsf-doc < 2.6
-BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core >= 8
-BuildRequires: globus-gram-protocol-devel >= 11
+BuildRequires: globus-common-devel >= 15
BuildRequires: globus-scheduler-event-generator-devel >= 4
-BuildRequires: globus-common-devel >= 14
-BuildRequires: globus-xio-devel >= 3
%package setup-poll
Summary: Globus Toolkit - LSF Job Manager Support using polling
@@ -48,7 +32,7 @@ Group: Applications/Internet
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch: noarch
%endif
-Provides: %{name}-setup
+Provides: %{name}-setup = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires(preun): globus-gram-job-manager-scripts >= 4
@@ -56,10 +40,9 @@ Requires(preun): globus-gram-job-manager-scripts >= 4
%package setup-seg
Summary: Globus Toolkit - LSF Job Manager Support using SEG
Group: Applications/Internet
-Provides: %{name}-setup
+Provides: %{name}-setup = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-scheduler-event-generator%{?_isa} >= 4
-Requires: globus-common%{?_isa} >= 14
+Requires: globus-scheduler-event-generator-progs >= 4
Requires(preun): globus-gram-job-manager-scripts >= 4
Requires(preun): globus-scheduler-event-generator-progs >= 4
@@ -97,19 +80,10 @@ state
%prep
%setup -q -n %{_name}-%{version}
-%patch0 -p1
%build
-# Remove files that should be replaced during bootstrap
-rm -f doxygen/Doxyfile*
-rm -f doxygen/Makefile.am
-rm -f pkgdata/Makefile.am
-rm -f globus_automake*
-rm -rf autom4te.cache
-
-unset GLOBUS_LOCATION
-unset GPT_LOCATION
-%{_datadir}/globus/globus-bootstrap.sh
+# Reduce overlinking
+export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
export BSUB=%{_bindir}/bsub
export BQUEUES=%{_bindir}/bqueues
@@ -119,8 +93,11 @@ export BHIST=%{_bindir}/bhist
export BACCT=%{_bindir}/bacct
export MPIEXEC=no
export MPIRUN=no
-%configure --disable-static --with-flavor=%{flavor} \
- --with-docdir=%{_pkgdocdir} \
+%configure --disable-static \
+ --includedir='${prefix}/include/globus' \
+ --libexecdir='${datadir}/globus' \
+ --docdir=%{_pkgdocdir} \
+ --with-perlmoduledir=%{perl_vendorlib} \
--with-globus-state-dir=%{_localstatedir}/log/globus
# Reduce overlinking
@@ -132,18 +109,8 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
-
-# This library is opened using lt_dlopenext, so the libtool archive
-# (.la file) can not be removed - fix the libdir and clear dependency_libs
-# ... and move it to the main package
-for lib in `find %{buildroot}%{_libdir} -name 'lib*.la'` ; do
- sed -e "s!^libdir=.*!libdir=\'%{_libdir}\'!" \
- -e "s!^dependency_libs=.*!dependency_libs=\'\'!" -i $lib
-done
-grep 'lib.*\.la$' $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
+# Remove libtool archives (.la files)
+rm %{buildroot}%{_libdir}/*.la
# Remove jobmanager-lsf from install dir - leave it for admin configuration
rm %{buildroot}/etc/grid-services/jobmanager-lsf
@@ -151,24 +118,6 @@ rm %{buildroot}/etc/grid-services/jobmanager-lsf
# Install README file
install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
-# Devel package is redundant
-rm %{buildroot}%{_libdir}/libglobus_seg_lsf.so
-rm %{buildroot}%{_libdir}/pkgconfig/globus-gram-job-manager-lsf.pc
-rm $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-rm $GLOBUSPACKAGEDIR/%{_name}/pkg_data_%{flavor}_dev.gpt
-
-# List config files in each package - drop the file list
-rm $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
-rm $GLOBUSPACKAGEDIR/%{_name}/pkg_data_noflavor_data.gpt
-
-# Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
- $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
- | sed -e s!^!%{_prefix}! -e 's!/man/.*!&*!' \
- -e /lsf.pm/d > package-seg.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- | sed 's!^!%doc %{_prefix}!' > package.filelist
-
%clean
rm -rf %{buildroot}
@@ -192,22 +141,31 @@ if [ $1 -eq 1 ]; then
/sbin/service globus-scheduler-event-generator condrestart lsf > /dev/null 2>&1 || :
fi
-%files -f package.filelist
+%files
%{_datadir}/globus/globus_gram_job_manager/lsf.rvf
-%{perl_vendorlib}/Globus
+%dir %{perl_vendorlib}/Globus
+%dir %{perl_vendorlib}/Globus/GRAM
+%dir %{perl_vendorlib}/Globus/GRAM/JobManager
+%{perl_vendorlib}/Globus/GRAM/JobManager/lsf.pm
%config(noreplace) %{_sysconfdir}/globus/globus-lsf.conf
-%dir %{_datadir}/globus/packages/%{_name}
%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%doc %{_pkgdocdir}/README
%files setup-poll
%config(noreplace) %{_sysconfdir}/grid-services/available/jobmanager-lsf-poll
-%files -f package-seg.filelist setup-seg
+%files setup-seg
+%{_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 Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+- Drop patch globus-gram-job-manager-lsf-statedir.patch (fixed upstream)
+
* Thu Aug 28 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.2-6
- Perl 5.20 rebuild
diff --git a/sources b/sources
index 1890404..484c0c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f3b6fcd6fa3765801ecba49911ce086 globus_gram_job_manager_lsf-1.2.tar.gz
+8c3d7841a42fb371bb30f42cb3c8c513 globus_gram_job_manager_lsf-2.5.tar.gz
More information about the scm-commits
mailing list