[globus-core/el4] Update to Globus Toolkit 5.2.0 Drop patches implemented upstream Drop the globus-gpt2pkg-config scri
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:18:15 UTC 2012
commit c1173132b4db2f13b62c9541f65a8e9e432a6648
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 06:55:52 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patches implemented upstream
Drop the globus-gpt2pkg-config script (now part of grid-packaging-tools)
Drop the globus-spec-creator script (now part of the upstream package)
.gitignore | 2 +-
GLOBUS-CCOMMONLIB | 3 +
globus-core-age-version.patch | 11 -
globus-core-ar-ranlib.patch | 18 -
globus-core-bootstrap-shebang.patch | 9 -
globus-core-compat.patch | 20 -
globus-core-conf.patch | 469 ---------------------
globus-core-doxygen.patch | 173 --------
globus-core-fedora.patch | 19 -
globus-core-func.patch | 12 -
globus-core-gnusource.patch | 26 --
globus-core-helpstring.patch | 171 --------
globus-core-libtool.patch | 16 -
globus-core-mingw.patch | 74 ----
globus-core-openssl.patch | 69 +++
globus-core-platforms.patch | 94 ----
globus-core-usr.patch | 275 ------------
globus-core.spec | 145 ++-----
globus-gpt2pkg-config | 84 ----
globus-spec-creator | 796 -----------------------------------
sources | 2 +-
21 files changed, 106 insertions(+), 2382 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ed13ec..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-globus_core-5.17.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-CCOMMONLIB b/GLOBUS-CCOMMONLIB
index b9cbdac..46b1fc0 100644
--- a/GLOBUS-CCOMMONLIB
+++ b/GLOBUS-CCOMMONLIB
@@ -20,3 +20,6 @@ http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/qp/
Migrating Guide:
http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-core-openssl.patch b/globus-core-openssl.patch
new file mode 100644
index 0000000..23f8714
--- /dev/null
+++ b/globus-core-openssl.patch
@@ -0,0 +1,69 @@
+diff -ur globus_core-8.3.orig/aclocal/globus_openssl.m4 globus_core-8.3/aclocal/globus_openssl.m4
+--- globus_core-8.3.orig/aclocal/globus_openssl.m4 2011-04-14 16:34:17.000000000 +0200
++++ globus_core-8.3/aclocal/globus_openssl.m4 2011-12-10 16:49:20.013168994 +0100
+@@ -25,43 +25,24 @@
+ if test "$OPENSSL_CFLAGS" = ""; then
+ if pkg-config openssl --exists > /dev/null 2>&1 ; then
+ OPENSSL_CFLAGS="`pkg-config openssl --cflags`"
++ elif test -r "${openssl}/include/openssl/ssl.h" ; then
++ OPENSSL_CFLAGS="-I ${openssl}/include"
+ fi
+ fi
+ AC_MSG_RESULT([using '$OPENSSL_CFLAGS'])
+ CFLAGS="${CFLAGS} ${OPENSSL_CFLAGS}"
+
+-AC_MSG_CHECKING([OpenSSL INCLUDES])
+-if test "$OPENSSL_INCLUDES" = ""; then
+- if pkg-config openssl --exists > /dev/null 2>&1 ; then
+- OPENSSL_INCLUDES="`pkg-config openssl --cflags-only-I`"
+- elif test -r "${openssl}/include/openssl/ssl.h" ; then
+- OPENSSL_INCLUDES="-I ${openssl}/include"
+- fi
+-fi
+-AC_MSG_RESULT([using '$OPENSSL_INCLUDES'])
+-CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDES}"
+ AC_TRY_COMPILE([#include <openssl/ssl.h>],
+ [SSL_library_init();],,
+ [AC_MSG_ERROR([Unable to compile with SSL])])
+
+-AC_MSG_CHECKING([OpenSSL LDFLAGS])
+-if test "$OPENSSL_LDFLAGS" = ""; then
+- if pkg-config openssl --exists > /dev/null 2>&1 ; then
+- OPENSSL_PKGCONF_DEPENDENCIES="openssl"
+- OPENSSL_LDFLAGS="`pkg-config openssl --libs`"
+- else
+- OPENSSL_LDFLAGS="-L${openssl}/lib"
+- fi
+-fi
+-AC_MSG_RESULT([using '$OPENSSL_LDFLAGS'])
+-LDFLAGS="${LDFLAGS} ${OPENSSL_LDFLAGS}"
+-
+ AC_MSG_CHECKING([OpenSSL LIBS])
+ if test "$OPENSSL_LIBS" = ""; then
+ if pkg-config openssl --exists > /dev/null 2>&1 ; then
+- OPENSSL_LIBS="`pkg-config openssl --libs-only-l`"
++ OPENSSL_PKGCONF_DEPENDENCIES="openssl"
++ OPENSSL_LIBS="`pkg-config openssl --libs`"
+ else
+- OPENSSL_LIBS="-lssl -lcrypto"
++ OPENSSL_LIBS="-L${openssl}/lib -lssl -lcrypto"
+ fi
+ fi
+ AC_MSG_RESULT([using '$OPENSSL_LIBS'])
+@@ -72,13 +53,12 @@
+ [SSL_library_init();], , [AC_MSG_ERROR([Unable to link with SSL])])
+
+ AC_SUBST(OPENSSL_CFLAGS)
+-AC_SUBST(OPENSSL_INCLUDES)
+-AC_SUBST(OPENSSL_LDFLAGS)
+ AC_SUBST(OPENSSL_LIBS)
+
+ if test "x$OPENSSL_PKGCONF_DEPENDENCIES" != "x"; then
+ GPT_PKGCONFIG_DEPENDENCIES="$GPT_PKGCONFIG_DEPENDENCIES $OPENSSL_PKGCONF_DEPENDENCIES"
++else
++ GPT_EXTERNAL_INCLUDES="${GPT_EXTERNAL_INCLUDES} ${OPENSSL_CFLAGS}"
++ GPT_EXTERNAL_LIBS="${GPT_EXTERNAL_LIBS} ${OPENSSL_LIBS}"
+ fi
+-GPT_EXTERNAL_LIBS="${GPT_EXTERNAL_LIBS} ${OPENSSL_LDFLAGS} ${OPENSSL_LIBS}"
+-GPT_EXTERNAL_INCLUDES="${GPT_EXTERNAL_INCLUDES} ${OPENSSL_CFLAGS} ${OPENSSL_INCLUDES}"
+ ])
diff --git a/globus-core.spec b/globus-core.spec
index eee7337..3a14e6b 100644
--- a/globus-core.spec
+++ b/globus-core.spec
@@ -1,8 +1,8 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%global enable64 yes
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%global enable64 no
%endif
@@ -12,76 +12,22 @@
Name: globus-core
%global _name %(tr - _ <<< %{name})
-Version: 5.17
-Release: 3%{?dist}
+Version: 8.5
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus Core
Group: Development/Tools
License: ASL 2.0
URL: http://www.globus.org/
-# Source is extracted from the globus toolkit installer:
-# wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.2/installers/src/gt5.0.2-all-source-installer.tar.bz2
-# tar -jxf gt5.0.2-all-source-installer.tar.bz2
-# mv gt5.0.2-all-source-installer/source-trees/core/source globus_core-5.17
-# tar -zcf globus_core-5.17.tar.gz globus_core-5.17
-Source: %{_name}-%{version}.tar.gz
-# GPT metadata to pkg-config file converter
-Source1: globus-gpt2pkg-config
-# Globus RPM specfile creator script
-Source2: globus-spec-creator
+Source: http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-CCOMMONLIB
-# Make file locations configurable:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
-Patch0: %{name}-conf.patch
-# Environment variable elimination patch:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6452
-Patch1: %{name}-usr.patch
-# Missing functions in configure check:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6453
-Patch2: %{name}-func.patch
-# Detect IOV_MAX correctly (requires _GNU_SOURCE):
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6454
-Patch3: %{name}-gnusource.patch
-# Make GPT_AGE_VERSION available to autotools:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6455
-Patch4: %{name}-age-version.patch
-# Missing shebang:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6456
-Patch5: %{name}-bootstrap-shebang.patch
-# Make configure --help look nice:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6457
-Patch6: %{name}-helpstring.patch
-# Fix doxygen documentation installation instructions:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6458
-Patch7: %{name}-doxygen.patch
-# Make it work with older and newer automake versions:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6565
-Patch8: %{name}-compat.patch
-# Avoid race condition when renaming the libtool file:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6575
-Patch9: %{name}-libtool.patch
-# Properly propagate $AR and $RANLIB:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6739
-Patch10: %{name}-ar-ranlib.patch
-# Fixes for mingw compilation:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
-Patch11: %{name}-mingw.patch
-# Fix build configuration for s390x and kfreebsd:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6754
-Patch12: %{name}-platforms.patch
-# Adapt dependency script to Fedora's documentation location:
-# Not relevant for upstream - not submitted to globus bugzilla
-Patch13: %{name}-fedora.patch
+Patch0: %{name}-openssl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: %{name}-devel = %{version}-%{release}
-Obsoletes: %{name}-devel < 5.15-0.5
Requires: pkgconfig
-Requires: perl(XML::DOM)
Requires: perl(XML::Parser)
-BuildRequires: grid-packaging-tools
-BuildRequires: perl(XML::DOM)
+BuildRequires: grid-packaging-tools >= 3.4
BuildRequires: perl(XML::Parser)
%description
@@ -95,20 +41,9 @@ Globus Core
%prep
%setup -q -n %{_name}-%{version}
-%patch0 -p1 -b .conf
-%patch1 -p1 -b .usr
-%patch2 -p1 -b .func
-%patch3 -p1 -b .gnusource
-%patch4 -p1 -b .age
-%patch5 -p1 -b .shebang
-%patch6 -p1 -b .help
-%patch7 -p1 -b .doxygen
-%patch8 -p1 -b .compat
-%patch9 -p1 -b .libtool
-%patch10 -p1 -b .ranlib
-%patch11 -p1 -b .mingw
-%patch12 -p1 -b .platform
-%patch13 -p1 -b .fedora
+%patch0 -p1
+
+sed 's/ -L$libdir//' -i config/accompiler.m4
# custom perl requires that removes dependency on gpt perl modules
cat << EOF > %{name}-req
@@ -123,19 +58,28 @@ chmod +x %{__perl_requires}
# Remove files that should be replaced during bootstrap
rm -rf autom4te.cache
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
./bootstrap
-%configure --includedir='${prefix}/include/globus' \
- --libexecdir='${datadir}/globus' \
- --with-threads=pthreads --with-thread-library=%{_libdir} \
- --with-flavor=%{flavor} \
+# Reduce overlinking
+export LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
+
+%configure --disable-static --with-flavor=%{flavor} \
--enable-64bit=%{enable64} \
+ --enable-debug \
+ --includedir='${prefix}/include/globus' \
+ --libexecdir='${datadir}/globus' \
--with-setupdir='${datadir}/globus/setup' \
--with-testdir='${datadir}/globus/test/${PACKAGE}' \
--with-flavorincludedir='${libdir}/globus/include' \
--with-perlmoduledir=%{perl_vendorlib} \
--with-doxygendir='${datadir}/globus/doxygen' \
- --with-newgpt
+ --with-docdir=%{_docdir}/%{name}-%{version} \
+ --with-initializer-libdir-based-on-machine-type
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
make %{?_smp_mflags}
@@ -148,46 +92,20 @@ chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
-# Add -Wl,--as-needed to the libtool script
-sed 's!CC -shared !CC \\\${wl}--as-needed -shared !g' \
- -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
-
-# Install the GPT metadata to pkg-config file converter
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
-
-# Install the Globus RPM specfile creator script
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-pod2man %{SOURCE2} > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
-
-# Generate pkg-config file from GPT metadata
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-$RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
- pkgdata/pkg_data_%{flavor}_dev.gpt > \
- $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
-
# Don't use /usr/bin/env
sed 's!/usr/bin/env perl!/usr/bin/perl!' -i $RPM_BUILD_ROOT%{_sbindir}/globus-*
-# Remove license file installed directly in the buildroot
-rm -f $RPM_BUILD_ROOT/GLOBUS_LICENSE
-sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
-
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
# Install README file
install -m 644 -p %{SOURCE8} \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
- $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
$GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
| sed s!^!%{_prefix}! > package.filelist
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
%clean
rm -rf $RPM_BUILD_ROOT
@@ -202,15 +120,16 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_libdir}/globus
%dir %{_libdir}/globus/include
-%{_libdir}/pkgconfig/%{name}.pc
-%{_datadir}/globus/globus-gpt2pkg-config
-%{_bindir}/globus-spec-creator
-%doc %{_mandir}/man1/globus-spec-creator.1*
%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%doc %{_docdir}/%{name}-%{version}/README
%changelog
+* Tue Dec 13 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.5-1
+- Update to Globus Toolkit 5.2.0
+- Drop patches implemented upstream
+- Drop the globus-gpt2pkg-config script (now part of grid-packaging-tools)
+- Drop the globus-spec-creator script (now part of the upstream package)
+
* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.17-3
- Update globus-spec-creator script
- Add README file
diff --git a/sources b/sources
index 151be53..c3f3353 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed456afa1ab9d9eeb6a7f427eecb4eb7 globus_core-5.17.tar.gz
+7361679ee8c7e3bfe35e74a0c1fb6061 globus_core-8.5.tar.gz
More information about the scm-commits
mailing list