[globus-callout/el4] Update to Globus Toolkit 5.2.0 Drop patches globus-callout-mingw.patch and globus-callout-noflavext.
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:19:11 UTC 2012
commit 50ab00ae1f9c68d79f94da3b09bcc3e6229c66ca
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 15:30:42 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patches globus-callout-mingw.patch and globus-callout-noflavext.patch
(fixed upstream)
.gitignore | 4 +-
GLOBUS-CCOMMONLIB | 3 +
globus-callout-doxygen.patch | 69 ++++++++++++++++++++++++++++++
globus-callout-ltdl-win.patch | 16 +++++++
globus-callout-mingw.patch | 37 ----------------
globus-callout-noflavext.patch | 35 ---------------
globus-callout.spec | 91 +++++++++++++++------------------------
sources | 2 +-
8 files changed, 126 insertions(+), 131 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06b2abb..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_callout-0.7.tar.gz
+/epstopdf-2.9.5gw
+/*.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-callout-doxygen.patch b/globus-callout-doxygen.patch
new file mode 100644
index 0000000..57f80c8
--- /dev/null
+++ b/globus-callout-doxygen.patch
@@ -0,0 +1,69 @@
+diff -ur globus_callout-2.1.orig/library/globus_callout_constants.h globus_callout-2.1/library/globus_callout_constants.h
+--- globus_callout-2.1.orig/library/globus_callout_constants.h 2006-01-19 06:54:06.000000000 +0100
++++ globus_callout-2.1/library/globus_callout_constants.h 2012-01-05 06:52:25.315447448 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_CALLOUT_CONSTANTS_H
++#define GLOBUS_CALLOUT_CONSTANTS_H
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_callout_constants.h
+@@ -26,9 +29,6 @@
+ */
+ #endif
+
+-#ifndef GLOBUS_CALLOUT_CONSTANTS_H
+-#define GLOBUS_CALLOUT_CONSTANTS_H
+-
+ #ifndef EXTERN_C_BEGIN
+ # ifdef __cplusplus
+ # define EXTERN_C_BEGIN extern "C" {
+diff -ur globus_callout-2.1.orig/library/globus_callout.h globus_callout-2.1/library/globus_callout.h
+--- globus_callout-2.1.orig/library/globus_callout.h 2006-01-19 06:54:06.000000000 +0100
++++ globus_callout-2.1/library/globus_callout.h 2012-01-05 06:52:07.675452038 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef _GLOBUS_CALLOUT_H_
++#define _GLOBUS_CALLOUT_H_
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_callout.c
+@@ -26,9 +29,6 @@
+ */
+ #endif
+
+-#ifndef _GLOBUS_CALLOUT_H_
+-#define _GLOBUS_CALLOUT_H_
+-
+ #ifndef EXTERN_C_BEGIN
+ # ifdef __cplusplus
+ # define EXTERN_C_BEGIN extern "C" {
+diff -ur globus_callout-2.1.orig/library/globus_i_callout.h globus_callout-2.1/library/globus_i_callout.h
+--- globus_callout-2.1.orig/library/globus_i_callout.h 2011-02-03 22:46:20.000000000 +0100
++++ globus_callout-2.1/library/globus_i_callout.h 2012-01-05 06:52:52.731440395 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef _GLOBUS_I_CALLOUT_H_
++#define _GLOBUS_I_CALLOUT_H_
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_i_callout.h
+@@ -25,9 +28,6 @@
+ * $Date: 2011/02/03 21:46:20 $
+ */
+
+-#ifndef _GLOBUS_I_CALLOUT_H_
+-#define _GLOBUS_I_CALLOUT_H_
+-
+ #include "globus_callout.h"
+
+ /* DEBUG MACROS */
diff --git a/globus-callout-ltdl-win.patch b/globus-callout-ltdl-win.patch
new file mode 100644
index 0000000..628daee
--- /dev/null
+++ b/globus-callout-ltdl-win.patch
@@ -0,0 +1,16 @@
+diff -ur globus_callout-1.0.orig/library/globus_callout.c globus_callout-1.0/library/globus_callout.c
+--- globus_callout-1.0.orig/library/globus_callout.c 2010-11-25 00:14:48.000000000 +0100
++++ globus_callout-1.0/library/globus_callout.c 2011-02-19 11:53:06.167863535 +0100
+@@ -30,12 +30,8 @@
+ #include "globus_i_callout.h"
+
+ #ifndef BUILD_STATIC_ONLY
+-#ifdef WIN32
+-#include "globus_libtool_windows.h"
+-#else
+ #include <ltdl.h>
+ #endif
+-#endif
+
+ #include "version.h"
+
diff --git a/globus-callout.spec b/globus-callout.spec
index 7f23e6c..762d9db 100644
--- a/globus-callout.spec
+++ b/globus-callout.spec
@@ -1,43 +1,37 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-callout
%global _name %(tr - _ <<< %{name})
-Version: 0.7
-Release: 8%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus Callout Library
Group: System Environment/Libraries
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.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
-# tar -jxf gt5.0.0-all-source-installer.tar.bz2
-# mv gt5.0.0-all-source-installer/source-trees/callout/source globus_callout-0.7
-# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_callout-0.7
-# tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
-Source: %{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-CCOMMONLIB
# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9: epstopdf-2.9.5gw
-# Allow loading callouts without flavor extensions:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6741
-Patch0: %{name}-noflavext.patch
-# Fixes for mingw compilation:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
-Patch1: %{name}-mingw.patch
+Patch0: %{name}-ltdl-win.patch
+Patch1: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-libtool%{?_isa} >= 1
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-libtool-devel%{?_isa} >= 1
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-common-devel%{?_isa} >= 14
+%if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
+BuildRequires: libtool-ltdl-devel%{?_isa}
+%else
+BuildRequires: libtool
+%endif
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -54,9 +48,8 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - Globus Callout Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-libtool-devel%{?_isa} >= 1
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-core%{?_isa} >= 4
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-core%{?_isa} >= 8
%package doc
Summary: Globus Toolkit - Globus Callout Library Documentation Files
@@ -116,18 +109,15 @@ rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
-# Remove flavor tags
-for f in `find . -name Makefile.am` ; do
- sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
- -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
- -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
-done
-sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
- -i pkgdata/pkg_data_src.gpt.in
-
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
%{_datadir}/globus/globus-bootstrap.sh
-%configure --with-flavor=%{flavor} --enable-doxygen
+%configure --disable-static --with-flavor=%{flavor} \
+ --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
make %{?_smp_mflags}
@@ -143,32 +133,18 @@ GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
-
-# Remove static libraries (.a files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-# Generate pkg-config file from GPT metadata
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
- $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
-
-# Move documentation to default RPM location
-mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
- $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-sed s!doc/%{_name}!doc/%{name}-%{version}! \
- -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+# Move license file to main package
+grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
+sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
-i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.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
@@ -192,18 +168,21 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%doc %{_docdir}/%{name}-%{version}/README
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}.pc
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patches globus-callout-mingw.patch and globus-callout-noflavext.patch
+ (fixed upstream)
+
* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-8
- Add README file
diff --git a/sources b/sources
index c1d9a23..5d3006f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-c2b5eeec562021d2e87fb1ef306bddec globus_callout-0.7.tar.gz
+3f687a4aa14297dbae432f106f99256b globus_callout-2.1.tar.gz
More information about the scm-commits
mailing list