From 9f16555cc4a8e4f010b71cca6e36a79cf7749883 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Feb 09 2010 07:28:22 +0000 Subject: - Update to Globus Toolkit 5.0.0 --- diff --git a/.cvsignore b/.cvsignore index a46c64f..c23ff23 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ epstopdf-2.9.5gw -globus_common-10.2.tar.gz +globus_common-11.2.tar.gz globus_common_setup-2.6.tar.gz diff --git a/globus-common-bad-age.patch b/globus-common-bad-age.patch deleted file mode 100644 index 6021239..0000000 --- a/globus-common-bad-age.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in ---- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in 2008-09-29 23:20:49.000000000 +0200 -+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in 2008-10-12 01:28:20.000000000 +0200 -@@ -3,7 +3,7 @@ - - - -- -+ - Common Library - Common - diff --git a/globus-common-doxygen-workaround.patch b/globus-common-doxygen-workaround.patch index 4b1bef2..0b2835b 100644 --- a/globus-common-doxygen-workaround.patch +++ b/globus-common-doxygen-workaround.patch @@ -1,6 +1,6 @@ -diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h ---- globus_common-10.2.orig/library/globus_callback.h 2009-11-08 13:52:51.214078077 +0100 -+++ globus_common-10.2/library/globus_callback.h 2009-11-08 13:53:51.862079194 +0100 +diff -ur globus_common-11.2.orig/library/globus_callback.h globus_common-11.2/library/globus_callback.h +--- globus_common-11.2.orig/library/globus_callback.h 2010-01-21 18:06:42.865531109 +0100 ++++ globus_common-11.2/library/globus_callback.h 2010-01-21 18:06:31.889284460 +0100 @@ -16,7 +16,7 @@ #ifndef GLOBUS_INCLUDE_GLOBUS_CALLBACK @@ -10,9 +10,9 @@ diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/li * @file globus_callback.h Globus Callback API * * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $ -diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h ---- globus_common-10.2.orig/library/globus_thread_common.h 2009-11-08 13:52:51.214078077 +0100 -+++ globus_common-10.2/library/globus_thread_common.h 2009-11-08 13:54:25.901243275 +0100 +diff -ur globus_common-11.2.orig/library/globus_thread_common.h globus_common-11.2/library/globus_thread_common.h +--- globus_common-11.2.orig/library/globus_thread_common.h 2010-01-21 18:06:42.866529977 +0100 ++++ globus_common-11.2/library/globus_thread_common.h 2010-01-21 18:06:31.890530356 +0100 @@ -14,7 +14,7 @@ * limitations under the License. */ @@ -22,16 +22,3 @@ diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10 * @file globus_thread_common.h Common Thread Interface * * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $ -diff -ur globus_common-10.2.orig/scripts/Makefile.am globus_common-10.2/scripts/Makefile.am ---- globus_common-10.2.orig/scripts/Makefile.am 2005-12-07 10:37:45.000000000 +0100 -+++ globus_common-10.2/scripts/Makefile.am 2009-11-08 14:12:37.139329290 +0100 -@@ -7,8 +7,7 @@ - bin_SCRIPTS = \ - globus-hostname \ - globus-domainname \ -- globus-makefile-header \ -- globus-makefile-header.gpt1 -+ globus-makefile-header - - globus-domainname: globus-hostname - cp $(srcdir)/globus-hostname $(builddir)/globus-domainname diff --git a/globus-common-doxygen.patch b/globus-common-doxygen.patch index 46910ef..98b41aa 100644 --- a/globus-common-doxygen.patch +++ b/globus-common-doxygen.patch @@ -1,6 +1,6 @@ -diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h ---- globus_common-10.2.orig/library/globus_callback.h 2006-01-19 06:54:13.000000000 +0100 -+++ globus_common-10.2/library/globus_callback.h 2008-10-08 05:05:28.000000000 +0200 +diff -ur globus_common-11.2.orig/library/globus_callback.h globus_common-11.2/library/globus_callback.h +--- globus_common-11.2.orig/library/globus_callback.h 2006-01-19 06:54:13.000000000 +0100 ++++ globus_common-11.2/library/globus_callback.h 2010-01-21 21:18:17.972530459 +0100 @@ -19,10 +19,10 @@ /** * @file globus_callback.h Globus Callback API @@ -16,9 +16,18 @@ diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/li */ /** -diff -ur globus_common-10.2.orig/library/globus_common.h.in globus_common-10.2/library/globus_common.h.in ---- globus_common-10.2.orig/library/globus_common.h.in 2006-01-19 06:54:14.000000000 +0100 -+++ globus_common-10.2/library/globus_common.h.in 2008-10-08 05:04:11.000000000 +0200 +@@ -984,7 +984,7 @@ + * An example use is for an io poller that sleeps indefinitely on select(). If + * the callback library receives a signal that it needs to deliver asap, it + * will call the wakeup handler(s), These wakeup handlers must run as though +- * they were called from a signal handler (dont use any thread utilities). ++ * they were called from a signal handler (don't use any thread utilities). + * The io poll example will likely write a single byte to a pipe that select() + * is monitoring. + * +diff -ur globus_common-11.2.orig/library/globus_common.h.in globus_common-11.2/library/globus_common.h.in +--- globus_common-11.2.orig/library/globus_common.h.in 2008-11-03 21:31:10.000000000 +0100 ++++ globus_common-11.2/library/globus_common.h.in 2010-01-21 21:16:09.650283033 +0100 @@ -44,14 +44,6 @@ EXTERN_C_BEGIN @@ -34,9 +43,9 @@ diff -ur globus_common-10.2.orig/library/globus_common.h.in globus_common-10.2/l /****************************************************************************** Type definitions ******************************************************************************/ -diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h ---- globus_common-10.2.orig/library/globus_thread_common.h 2006-01-19 06:54:14.000000000 +0100 -+++ globus_common-10.2/library/globus_thread_common.h 2008-10-08 05:04:58.000000000 +0200 +diff -ur globus_common-11.2.orig/library/globus_thread_common.h globus_common-11.2/library/globus_thread_common.h +--- globus_common-11.2.orig/library/globus_thread_common.h 2006-01-19 06:54:14.000000000 +0100 ++++ globus_common-11.2/library/globus_thread_common.h 2010-01-21 21:16:09.651283298 +0100 @@ -17,10 +17,10 @@ /** * @file globus_thread_common.h Common Thread Interface @@ -52,9 +61,9 @@ diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10 */ /****************************************************************************** -diff -ur globus_common-10.2.orig/library/globus_url.h globus_common-10.2/library/globus_url.h ---- globus_common-10.2.orig/library/globus_url.h 2008-01-23 18:26:04.000000000 +0100 -+++ globus_common-10.2/library/globus_url.h 2008-10-08 06:02:49.000000000 +0200 +diff -ur globus_common-11.2.orig/library/globus_url.h globus_common-11.2/library/globus_url.h +--- globus_common-11.2.orig/library/globus_url.h 2008-01-23 18:26:04.000000000 +0100 ++++ globus_common-11.2/library/globus_url.h 2010-01-21 21:16:09.651283298 +0100 @@ -67,7 +67,7 @@ GLOBUS_URL_SCHEME_X_NEXUS, /** GASS Cache Entry */ diff --git a/globus-common-extradist.patch b/globus-common-extradist.patch index b3ed4c1..dab05d6 100644 --- a/globus-common-extradist.patch +++ b/globus-common-extradist.patch @@ -1,16 +1,16 @@ -diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am ---- globus_common-10.2.orig/programs/Makefile.am 2008-12-11 16:13:45.120989000 +0100 -+++ globus_common-10.2/programs/Makefile.am 2008-12-11 16:15:09.868546294 +0100 +diff -ur globus_common-11.2.orig/programs/Makefile.am globus_common-11.2/programs/Makefile.am +--- globus_common-11.2.orig/programs/Makefile.am 2010-01-21 17:42:10.644280522 +0100 ++++ globus_common-11.2/programs/Makefile.am 2010-01-21 17:51:34.322281411 +0100 @@ -5,8 +5,6 @@ - sbin_PROGRAMS = globus-libc-hostname globus-is-local-user + sbin_PROGRAMS = globus-libc-hostname globus-is-local-user globus-redia -EXTRA_DIST = globus-sh-exec.in globus-version.in - INCLUDES = -I$(top_srcdir)/library $(GPT_INCLUDES) - globus_libc_hostname_SOURCES = globus_libc_hostname.c -@@ -21,5 +19,7 @@ + globus_redia_SOURCES = globus_redia.c +@@ -25,5 +23,7 @@ globus_is_local_user_LDADD = ../library/libglobus_common_$(GLOBUS_FLAVOR_NAME).la @GPT_PGM_LINKS@ endif diff --git a/globus-common-ltdlmutex.patch b/globus-common-ltdlmutex.patch index fbd40a0..9180611 100644 --- a/globus-common-ltdlmutex.patch +++ b/globus-common-ltdlmutex.patch @@ -1,6 +1,6 @@ -diff -ur globus_common-10.2.orig/configure.in globus_common-10.2/configure.in ---- globus_common-10.2.orig/configure.in 2007-12-12 00:29:27.000000000 +0100 -+++ globus_common-10.2/configure.in 2008-12-18 09:02:27.000000000 +0100 +diff -ur globus_common-11.2.orig/configure.in globus_common-11.2/configure.in +--- globus_common-11.2.orig/configure.in 2008-10-22 18:42:37.000000000 +0200 ++++ globus_common-11.2/configure.in 2010-01-21 17:54:34.099279823 +0100 @@ -24,6 +24,11 @@ GPT_SET_LIBS(["$EXTERNAL_LIBS"]) @@ -12,10 +12,10 @@ diff -ur globus_common-10.2.orig/configure.in globus_common-10.2/configure.in + AC_SUBST(GLOBUS_THREADS) - if test x"$GLOBUS_VERSIONNAME" = "x" ; then -diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c ---- globus_common-10.2.orig/library/globus_extension.c 2008-03-12 20:01:05.000000000 +0100 -+++ globus_common-10.2/library/globus_extension.c 2008-12-18 09:04:27.000000000 +0100 + if test "X$GLOBUS_VERSION" = "X"; then +diff -ur globus_common-11.2.orig/library/globus_extension.c globus_common-11.2/library/globus_extension.c +--- globus_common-11.2.orig/library/globus_extension.c 2008-03-12 20:01:05.000000000 +0100 ++++ globus_common-11.2/library/globus_extension.c 2010-01-21 17:54:34.100280018 +0100 @@ -14,6 +14,7 @@ * limitations under the License. */ diff --git a/globus-common-usr.patch b/globus-common-usr.patch index d39cc98..7346b28 100644 --- a/globus-common-usr.patch +++ b/globus-common-usr.patch @@ -1,6 +1,6 @@ -diff -ur globus_common-10.2.orig/library/globus_common_paths.c globus_common-10.2/library/globus_common_paths.c ---- globus_common-10.2.orig/library/globus_common_paths.c 2006-01-19 06:54:14.000000000 +0100 -+++ globus_common-10.2/library/globus_common_paths.c 2009-08-04 16:43:07.208220052 +0200 +diff -ur globus_common-11.2.orig/library/globus_common_paths.c globus_common-11.2/library/globus_common_paths.c +--- globus_common-11.2.orig/library/globus_common_paths.c 2006-01-19 06:54:14.000000000 +0100 ++++ globus_common-11.2/library/globus_common_paths.c 2010-01-21 17:40:22.405535210 +0100 @@ -111,8 +111,7 @@ p = globus_libc_getenv(name); if (!p || strlen(p)==0) @@ -32,9 +32,9 @@ diff -ur globus_common-10.2.orig/library/globus_common_paths.c globus_common-10. globus_free(deploy); fp = fopen(filename,"r"); -diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c ---- globus_common-10.2.orig/library/globus_extension.c 2008-03-12 20:01:05.000000000 +0100 -+++ globus_common-10.2/library/globus_extension.c 2009-08-03 19:57:22.077217655 +0200 +diff -ur globus_common-11.2.orig/library/globus_extension.c globus_common-11.2/library/globus_extension.c +--- globus_common-11.2.orig/library/globus_extension.c 2008-03-12 20:01:05.000000000 +0100 ++++ globus_common-11.2/library/globus_extension.c 2010-01-21 17:40:22.406533240 +0100 @@ -195,14 +195,17 @@ if(globus_location(&tmp) == GLOBUS_SUCCESS) @@ -58,9 +58,9 @@ diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/l } initialized = GLOBUS_TRUE; -diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am ---- globus_common-10.2.orig/Makefile.am 2004-10-11 14:53:32.000000000 +0200 -+++ globus_common-10.2/Makefile.am 2009-08-03 12:31:55.267481653 +0200 +diff -ur globus_common-11.2.orig/Makefile.am globus_common-11.2/Makefile.am +--- globus_common-11.2.orig/Makefile.am 2004-10-11 14:53:32.000000000 +0200 ++++ globus_common-11.2/Makefile.am 2010-01-21 17:40:22.406533240 +0100 @@ -9,7 +9,7 @@ config \ doxygen @@ -70,9 +70,9 @@ diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am config.guess EXTRA_DIST = \ -diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in ---- globus_common-10.2.orig/programs/globus-sh-exec.in 2006-01-19 06:54:19.000000000 +0100 -+++ globus_common-10.2/programs/globus-sh-exec.in 2009-08-03 12:31:55.268482825 +0200 +diff -ur globus_common-11.2.orig/programs/globus-sh-exec.in globus_common-11.2/programs/globus-sh-exec.in +--- globus_common-11.2.orig/programs/globus-sh-exec.in 2006-01-19 06:54:19.000000000 +0100 ++++ globus_common-11.2/programs/globus-sh-exec.in 2010-01-21 17:40:22.406533240 +0100 @@ -17,7 +17,11 @@ # @@ -86,10 +86,10 @@ diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/p globus_source ${libexecdir}/globus-sh-tools.sh # This was done by the script initializer before V2.0 -diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in ---- globus_common-10.2.orig/programs/globus-version.in 2008-09-29 23:20:05.000000000 +0200 -+++ globus_common-10.2/programs/globus-version.in 2009-08-03 12:31:55.269484149 +0200 -@@ -43,7 +43,11 @@ +diff -ur globus_common-11.2.orig/programs/globus-version.in globus_common-11.2/programs/globus-version.in +--- globus_common-11.2.orig/programs/globus-version.in 2008-10-22 18:42:37.000000000 +0200 ++++ globus_common-11.2/programs/globus-version.in 2010-01-21 17:40:22.407532807 +0100 +@@ -37,7 +37,11 @@ usage() { @@ -102,21 +102,21 @@ diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/p globus_source ${libexecdir}/globus-sh-tools.sh ${GLOBUS_SH_CAT-cat} 1>&2 <) { -diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1 ---- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 2003-02-05 03:48:31.000000000 +0100 -+++ globus_common-10.2/scripts/globus-makefile-header.gpt1 2009-08-03 12:31:55.272482892 +0200 -@@ -15,18 +15,13 @@ - - my $flavor; - my $link="static"; --my $gpt=$ENV{GPT_LOCATION}; -+ - my $gpath = $ENV{GPT_LOCATION}; - if (!defined($gpath)) - { -- $gpath = $ENV{GLOBUS_LOCATION}; -- -- } -- if (!defined($gpath)) -- { -- die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script" -- } -- -+ $gpath = "/usr"; -+} -+ - @INC = (@INC, "$gpath/lib/perl"); - - require Grid::GPT::Dependencies; -@@ -40,20 +35,10 @@ - my $pgm_linkslist; - my $lib_linkslist; - --if(!defined($gpt)) --{ -- $gpt=$ENV{GLOBUS_LOCATION}; --} --if(!defined($gpt)) --{ -- die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script\n"; --} -- - my $globus=$ENV{GLOBUS_LOCATION}; -- - if(!defined($globus)) - { -- die "ERROR: GLOBUS_LOCATION needs to be set before running this script\n"; -+ $globus = "/usr"; - } - - my %hash; -@@ -102,14 +87,23 @@ - - assemble_link_lines($fakepkg, $flavor, $link); - -+@INC = ("$globus/lib/perl", @INC); -+ -+require Globus::Core::Paths; -+my $includedir = $Globus::Core::Paths::includedir; -+my $flavorincludedir = $Globus::Core::Paths::flavorincludedir; -+my $libdir = $Globus::Core::Paths::libdir; -+ - push @temp_header, "GLOBUS_CFLAGS=\"$cflagslist\"\n"; --push @temp_header, "GLOBUS_INCLUDES=\" -I$ENV{GLOBUS_LOCATION}/include/$flavor $includeslist\"\n"; -+push @temp_header, "GLOBUS_INCLUDES=\"-I$includedir -I$flavorincludedir $includeslist\"\n"; - push @temp_header, "GLOBUS_LIBS=\"$libslist\"\n"; --push @temp_header, "GLOBUS_LDFLAGS=\" -L$ENV{GLOBUS_LOCATION}/lib\n"; -+push @temp_header, "GLOBUS_LDFLAGS=\"-L$libdir\"\n"; - push @temp_header, "GLOBUS_PKG_LIBS=\"$pkglibslist\"\n"; - push @temp_header, "GLOBUS_LIBTOOL=$globus/sbin/libtool-$flavor\n"; - --open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-build-env-$flavor.sh\n"; -+open(IN, "$globus/share/globus/globus-build-env-$flavor.sh") || -+ open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || -+ die "ERROR: Cannot open globus-build-env-$flavor.sh\n"; - - while() - { -@@ -130,7 +124,9 @@ - - #END of Section one: prepending GLOBUS_ - close (IN); --open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-sh-tools-vars.sh\n"; -+open(IN, "$globus/share/globus/globus-sh-tools-vars.sh") || -+ open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || -+ die "ERROR: Cannot open globus-sh-tools-vars.sh\n"; - while() - { - if(m!\S!) -diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh ---- globus_common-10.2.orig/scripts/globus-sh-tools.sh 2006-01-19 06:54:22.000000000 +0100 -+++ globus_common-10.2/scripts/globus-sh-tools.sh 2009-08-03 12:31:55.273482271 +0200 +diff -ur globus_common-11.2.orig/scripts/globus-sh-tools.sh globus_common-11.2/scripts/globus-sh-tools.sh +--- globus_common-11.2.orig/scripts/globus-sh-tools.sh 2006-01-19 06:54:22.000000000 +0100 ++++ globus_common-11.2/scripts/globus-sh-tools.sh 2010-01-21 17:40:42.884287442 +0100 @@ -18,7 +18,11 @@ if test -z "$GLOBUS_SH_VARIABLES_SET" ; then diff --git a/globus-common.spec b/globus-common.spec index f14a1b1..68fa275 100644 --- a/globus-common.spec +++ b/globus-common.spec @@ -8,26 +8,26 @@ Name: globus-common %global _name %(tr - _ <<< %{name}) -Version: 10.2 +Version: 11.2 %global setupversion 2.6 -Release: 8%{?dist} +Release: 1%{?dist} Summary: Globus Toolkit - Common 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/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 -# tar -jxf gt4.2.1-all-source-installer.tar.bz2 -# mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2 -# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-10.2 -# tar -zcf globus_common-10.2.tar.gz globus_common-10.2 +# 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/common/source globus_common-11.2 +# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-11.2 +# tar -zcf globus_common-11.2.tar.gz globus_common-11.2 Source: %{_name}-%{version}.tar.gz # Source1 is extracted from the globus toolkit installer: -# wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 -# tar -jxf gt4.2.1-all-source-installer.tar.bz2 -# mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6 -# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6 +# 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/common/setup globus_common_setup-2.6 +# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6 # tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6 Source1: %{_name}_setup-%{setupversion}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 @@ -54,33 +54,38 @@ Patch5: %{name}-nosuchfile.patch # Doxygen warning fix: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6465 Patch6: %{name}-doxygen.patch -# Bad version information: -# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6466 -Patch7: %{name}-bad-age.patch # Extradist should not be conditional: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6576 -Patch8: %{name}-extradist.patch +Patch7: %{name}-extradist.patch # Check for function removed from newer versions of libltdl: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6578 -Patch9: %{name}-ltdlmutex.patch +Patch8: %{name}-ltdlmutex.patch # Fixes for mingw compilation: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742 -Patch10: %{name}-mingw.patch +Patch9: %{name}-mingw.patch # Not all platforms defines PATH_MAX: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6755 -Patch11: %{name}-pathmax.patch +Patch10: %{name}-pathmax.patch # Let globus-makefile-header fail gracefully without GPT: # Not really relevant for globus upstream -Patch12: %{name}-makefile-header.patch +Patch11: %{name}-makefile-header.patch # Workaround a bug in doxygen 1.6.0 and later: # https://bugzilla.gnome.org/show_bug.cgi?id=593759 -Patch13: %{name}-doxygen-workaround.patch +Patch12: %{name}-doxygen-workaround.patch # Configure options not propagated in globus common setup: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6467 -Patch14: %{name}-setup.patch +Patch13: %{name}-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-libtool%{?_isa} >= 1 +# Obsolete dropped packages from Globus Toolkit 4.2.1 +Obsoletes: globus-data-conversion +Obsoletes: globus-mp +Obsoletes: globus-nexus +Obsoletes: globus-duct-common +Obsoletes: globus-duct-control +Obsoletes: globus-duroc-common +Obsoletes: globus-duroc-control BuildRequires: grid-packaging-tools BuildRequires: globus-libtool-devel%{?_isa} >= 1 BuildRequires: globus-core%{?_isa} >= 4 @@ -114,6 +119,14 @@ Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-libtool-devel%{?_isa} >= 1 Requires: globus-core%{?_isa} >= 4 +# Obsolete dropped packages from Globus Toolkit 4.2.1 +Obsoletes: globus-data-conversion-devel +Obsoletes: globus-mp-devel +Obsoletes: globus-nexus-devel +Obsoletes: globus-duct-common-devel +Obsoletes: globus-duct-control-devel +Obsoletes: globus-duroc-common-devel +Obsoletes: globus-duroc-control-devel %package doc Summary: Globus Toolkit - Common Library Documentation Files @@ -170,15 +183,14 @@ Common Library Documentation Files %patch4 -p1 -b .typo %patch5 -p1 -b .nofile %patch6 -p1 -b .doxygen -%patch7 -p1 -b .age -%patch8 -p1 -b .extradist -%patch9 -p1 -b .ltdlmutex -%patch10 -p1 -b .mingw -%patch11 -p1 -b .pathmax -%patch12 -p1 -b .mfheader -%patch13 -p1 -b .doxygenbug +%patch7 -p1 -b .extradist +%patch8 -p1 -b .ltdlmutex +%patch9 -p1 -b .mingw +%patch10 -p1 -b .pathmax +%patch11 -p1 -b .mfheader +%patch12 -p1 -b .doxygenbug cd %{_name}_setup-%{setupversion} -%patch14 -p1 -b .setup +%patch13 -p1 -b .setup cd - # custom perl requires that removes dependency on gpt perl modules @@ -369,6 +381,12 @@ rm -f config.log config.status %dir %{_docdir}/%{name}-%{version}/html %changelog +* Thu Jan 21 2010 Mattias Ellert - 11.2-1 +- Update to Globus Toolkit 5.0.0 + +* Fri Dec 04 2009 Stepan Kasal - 10.2-9 +- rebuild against perl 5.10.1 + * Sun Nov 08 2009 Mattias Ellert - 10.2-8 - Let globus-makefile-header fail gracefully when GPT is not present - Workaround a bug in doxygen diff --git a/import.log b/import.log index ebb7f4e..2a0ae4b 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ globus-common-10_2-4_fc9:F-11:globus-common-10.2-4.fc9.src.rpm:1240864567 globus-common-10_2-5_fc9:F-11:globus-common-10.2-5.fc9.src.rpm:1245080209 globus-common-10_2-7_fc11:F-11:globus-common-10.2-7.fc11.src.rpm:1249809012 globus-common-10_2-8_fc11:F-11:globus-common-10.2-8.fc11.src.rpm:1257706462 +globus-common-11_2-1_fc12:F-11:globus-common-11.2-1.fc12.src.rpm:1265700485 diff --git a/sources b/sources index f875060..0bed32d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw -92ce30191723a419252bd595fa1a6c08 globus_common-10.2.tar.gz -7954be1b1d10ec20d72159ceccafa386 globus_common_setup-2.6.tar.gz +b842bfb8b089660ef3933c4998c31e8e globus_common-11.2.tar.gz +5d159dc581d2d18c4ed16eb7b7cea2fa globus_common_setup-2.6.tar.gz