[globus-gram-job-manager-fork/el5: 5/5] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Thu Sep 18 16:30:11 UTC 2014
commit 283836c55060fc0eca5bd10641a89b699ed51d25
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Sep 18 18:19:12 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
globus-gram-job-manager-fork.spec | 116 +++++++++++++------------------------
sources | 2 +-
2 files changed, 41 insertions(+), 77 deletions(-)
---
diff --git a/globus-gram-job-manager-fork.spec b/globus-gram-job-manager-fork.spec
index eeb78a8..417bf50 100644
--- a/globus-gram-job-manager-fork.spec
+++ b/globus-gram-job-manager-fork.spec
@@ -1,43 +1,37 @@
-%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-fork
%global _name %(tr - _ <<< %{name})
-Version: 1.5
-Release: 12%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: Globus Toolkit - Fork 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.1/packages/src/%{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-GRAM5
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-gram-job-manager >= 13
+# A requirement on globus-gram-job-manager would make sense.
+# However, that would create a circular build dependency when
+# building the globus-gram-job-manager package, since the test
+# suite for that package requires globus-gram-job-manager-fork
+# to run.
+# 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-fork = 4.3
Obsoletes: globus-gram-job-manager-setup-fork < 4.3
Obsoletes: globus-gram-job-manager-setup-fork-doc < 4.3
-BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core >= 8
-BuildRequires: globus-gram-protocol-devel >= 11
-BuildRequires: globus-scheduler-event-generator-devel >= 4
-BuildRequires: globus-common-devel >= 14
+BuildRequires: globus-common-devel >= 15
BuildRequires: globus-xio-devel >= 3
+BuildRequires: globus-scheduler-event-generator-devel >= 4
+BuildRequires: globus-gram-protocol-devel >= 11
%package setup-poll
Summary: Globus Toolkit - Fork Job Manager Support using polling
@@ -45,7 +39,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
@@ -53,12 +47,9 @@ Requires(preun): globus-gram-job-manager-scripts >= 4
%package setup-seg
Summary: Globus Toolkit - Fork Job Manager Support using SEG
Group: Applications/Internet
-Provides: %{name}-setup
+Provides: %{name}-setup = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-gram-protocol%{?_isa} >= 11
-Requires: globus-scheduler-event-generator%{?_isa} >= 4
-Requires: globus-common%{?_isa} >= 14
-Requires: globus-xio%{?_isa} >= 3
+Requires: globus-scheduler-event-generator-progs >= 4
Requires(preun): globus-gram-job-manager-scripts >= 4
Requires(preun): globus-scheduler-event-generator-progs >= 4
@@ -98,21 +89,16 @@ state
%setup -q -n %{_name}-%{version}
%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 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
@@ -124,48 +110,15 @@ 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-fork from install dir - leave it for admin configuration
rm %{buildroot}/etc/grid-services/jobmanager-fork
-# Move script man pages to progs package
-grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
-sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
# Install README file
install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
-# Devel package is redundant
-rm %{buildroot}%{_libdir}/libglobus_seg_fork.so
-rm %{buildroot}%{_libdir}/pkgconfig/globus-gram-job-manager-fork.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 /fork.pm/d > package-seg.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- | sed 's!^!%doc %{_prefix}!' > package.filelist
-
%clean
rm -rf %{buildroot}
@@ -189,21 +142,32 @@ if [ $1 -eq 1 ]; then
/sbin/service globus-scheduler-event-generator condrestart fork > /dev/null 2>&1 || :
fi
-%files -f package.filelist
-%{perl_vendorlib}/Globus
+%files
+%dir %{perl_vendorlib}/Globus
+%dir %{perl_vendorlib}/Globus/GRAM
+%dir %{perl_vendorlib}/Globus/GRAM/JobManager
+%{perl_vendorlib}/Globus/GRAM/JobManager/fork.pm
+%dir %{_sysconfdir}/globus
%config(noreplace) %{_sysconfdir}/globus/globus-fork.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-fork-poll
-%files -f package-seg.filelist setup-seg
+%files setup-seg
+%{_libdir}/libglobus_seg_fork.so
+%{_sbindir}/globus-fork-starter
+%doc %{_mandir}/man8/globus-fork-starter.8*
%config(noreplace) %{_sysconfdir}/grid-services/available/jobmanager-fork-seg
%config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/fork
%changelog
+* 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
+
* Thu Aug 28 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.5-12
- Perl 5.20 rebuild
diff --git a/sources b/sources
index d473230..1820d39 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea8d46de49b2ab11513d198e66c7581d globus_gram_job_manager_fork-1.5.tar.gz
+1960538b87dabe01be7febf4e0281a53 globus_gram_job_manager_fork-2.4.tar.gz
More information about the scm-commits
mailing list