Fri Mar 20 07:23:25 UTC 2009

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9568/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-core-age-version.patch 
	globus-core-bootstrap-shebang.patch globus-core-compat.patch 
	globus-core-conf.patch globus-core-doxygen.patch 
	globus-core-fedora.patch globus-core-func.patch 
	globus-core-gnusource.patch globus-core-helpstring.patch 
	globus-core-libtool.patch globus-core-usr.patch 
	globus-core.spec globus-gpt2pkg-config import.log 
Log Message:
* Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
- Change defines to globals


globus-core-age-version.patch:

--- NEW FILE globus-core-age-version.patch ---
diff -ur globus-core-4.34.orig/aclocal/globus_package.m4 globus-core-4.34/aclocal/globus_package.m4
--- globus-core-4.34.orig/aclocal/globus_package.m4	2004-08-24 17:37:03.000000000 +0200
+++ globus-core-4.34/aclocal/globus_package.m4	2008-06-21 16:07:56.000000000 +0200
@@ -127,6 +117,7 @@
 dnl GPT_MAJOR_VERSION and GPT_MINOR_VERSION provided by GPT_INIT
 AC_SUBST(GPT_MAJOR_VERSION)
 AC_SUBST(GPT_MINOR_VERSION)
+AC_SUBST(GPT_AGE_VERSION)
 AC_SUBST(DIRT_TIMESTAMP)
 AC_SUBST(DIRT_BRANCH_ID)
 

globus-core-bootstrap-shebang.patch:

--- NEW FILE globus-core-bootstrap-shebang.patch ---
diff -ur globus_core-5.14.orig/scripts/globus-bootstrap.sh globus_core-5.14/scripts/globus-bootstrap.sh
--- globus_core-5.14.orig/scripts/globus-bootstrap.sh	2008-10-08 16:34:56.000000000 +0200
+++ globus_core-5.14/scripts/globus-bootstrap.sh	2008-10-08 16:39:29.000000000 +0200
@@ -1,4 +1,4 @@
- 
+#!/bin/sh 
 
 # 
 # Copyright 1999-2006 University of Chicago

globus-core-compat.patch:

--- NEW FILE globus-core-compat.patch ---
diff -ur globus_core-5.15.orig/pkgdata/Makefile.am globus_core-5.15/pkgdata/Makefile.am
--- globus_core-5.15.orig/pkgdata/Makefile.am	2006-01-12 18:12:52.000000000 +0100
+++ globus_core-5.15/pkgdata/Makefile.am	2008-12-08 23:22:23.000000000 +0100
@@ -44,12 +44,12 @@
 
 install-pkgDATA: $(pkg_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)";
+	test -z "$(pkgdir)" || $(mkinstalldirs) "$(DESTDIR)$(pkgdir)";
 	@list='$(pkg_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(pkgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
-	  $(pkgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
 	done || true
 
 

globus-core-conf.patch:

--- NEW FILE globus-core-conf.patch ---
diff -Nur globus_core-5.15.orig/aclocal/automake_rules globus_core-5.15/aclocal/automake_rules
--- globus_core-5.15.orig/aclocal/automake_rules	2001-06-04 21:46:01.000000000 +0200
+++ globus_core-5.15/aclocal/automake_rules	2008-10-12 14:44:40.000000000 +0200
@@ -4,15 +4,15 @@
 
 filelist-am:
 
-link: link-recursive link-libLTLIBRARIES link-libLIBRARIES link-libexecPROGRAMS link-libexecSCRIPTS link-etcDATA link-binPROGRAMS link-binSCRIPTS link-sbinPROGRAMS link-sbinSCRIPTS link-includeHEADERS link-shareDATA link-setupDATA link-setupPROGRAMS link-setupSCRIPTS link-testDATA link-testPROGRAMS link-testSCRIPTS link-scriptsysconfPROGRAMS link-scriptsysconfSCRIPTS link-flavorincludeHEADERS link-pkgDATA link-aclocalDATA link-doxygenDATA link-docDATA 
+link: link-recursive link-libLTLIBRARIES link-libLIBRARIES link-libexecPROGRAMS link-libexecSCRIPTS link-etcDATA link-binPROGRAMS link-binSCRIPTS link-sbinPROGRAMS link-sbinSCRIPTS link-includeHEADERS link-shareDATA link-setupDATA link-setupPROGRAMS link-setupSCRIPTS link-testDATA link-testPROGRAMS link-testSCRIPTS link-scriptsysconfPROGRAMS link-scriptsysconfSCRIPTS link-flavorincludeHEADERS link-pkgDATA link-aclocalDATA link-perlmoduleDATA link-doxygenDATA link-docDATA 
 	:
 
-unlink: unlink-recursive unlink-libLTLIBRARIES unlink-libLIBRARIES unlink-libexecPROGRAMS unlink-libexecSCRIPTS unlink-etcDATA unlink-binPROGRAMS unlink-binSCRIPTS unlink-sbinPROGRAMS unlink-sbinSCRIPTS unlink-includeHEADERS unlink-shareDATA unlink-setupDATA unlink-setupPROGRAMS unlink-setupSCRIPTS unlink-testDATA unlink-testPROGRAMS unlink-testSCRIPTS unlink-scriptsysconfPROGRAMS unlink-scriptsysconfSCRIPTS unlink-flavorincludeHEADERS unlink-pkgDATA unlink-aclocalDATA unlink-doxygenDATA unlink-docDATA 
+unlink: unlink-recursive unlink-libLTLIBRARIES unlink-libLIBRARIES unlink-libexecPROGRAMS unlink-libexecSCRIPTS unlink-etcDATA unlink-binPROGRAMS unlink-binSCRIPTS unlink-sbinPROGRAMS unlink-sbinSCRIPTS unlink-includeHEADERS unlink-shareDATA unlink-setupDATA unlink-setupPROGRAMS unlink-setupSCRIPTS unlink-testDATA unlink-testPROGRAMS unlink-testSCRIPTS unlink-scriptsysconfPROGRAMS unlink-scriptsysconfSCRIPTS unlink-flavorincludeHEADERS unlink-pkgDATA unlink-aclocalDATA unlink-perlmoduleDATA unlink-doxygenDATA unlink-docDATA 
 	:
 
-.PHONY: link unlink link-recursive unlink-recursive link-am unlink-am filelist-amlink-libLTLIBRARIES unlink-libLTLIBRARIES filelist-libLTLIBRARIES link-libLIBRARIES unlink-libLIBRARIES filelist-libLIBRARIES link-libexecPROGRAMS unlink-libexecPROGRAMS filelist-libexecPROGRAMS link-libexecSCRIPTS unlink-libexecSCRIPTS filelist-libexecSCRIPTS link-etcDATA unlink-etcDATA filelist-etcDATA link-binPROGRAMS unlink-binPROGRAMS filelist-binPROGRAMS link-binSCRIPTS unlink-binSCRIPTS filelist-binSCRIPTS link-sbinPROGRAMS unlink-sbinPROGRAMS filelist-sbinPROGRAMS link-sbinSCRIPTS unlink-sbinSCRIPTS filelist-sbinSCRIPTS link-includeHEADERS unlink-includeHEADERS filelist-includeHEADERS link-shareDATA unlink-shareDATA filelist-shareDATA link-setupDATA unlink-setupDATA filelist-setupDATA link-setupPROGRAMS unlink-setupPROGRAMS filelist-setupPROGRAMS link-setupSCRIPTS unlink-setupSCRIPTS filelist-setupSCRIPTS link-testDATA unlink-testDATA filelist-testDATA link-testPROGRAMS unlink-testPROGRA
 MS filelist-testPROGRAMS link-testSCRIPTS unlink-testSCRIPTS filelist-testSCRIPTS link-scriptsysconfPROGRAMS unlink-scriptsysconfPROGRAMS filelist-scriptsysconfPROGRAMS link-scriptsysconfSCRIPTS unlink-scriptsysconfSCRIPTS filelist-scriptsysconfSCRIPTS link-flavorincludeHEADERS unlink-flavorincludeHEADERS filelist-flavorincludeHEADERS link-pkgDATA unlink-pkgDATA filelist-pkgDATA link-aclocalDATA unlink-aclocalDATA filelist-aclocalDATA link-doxygenDATA unlink-doxygenDATA filelist-doxygenDATA link-docDATA unlink-docDATA filelist-docDATA 
+.PHONY: link unlink link-recursive unlink-recursive link-am unlink-am filelist-amlink-libLTLIBRARIES unlink-libLTLIBRARIES filelist-libLTLIBRARIES link-libLIBRARIES unlink-libLIBRARIES filelist-libLIBRARIES link-libexecPROGRAMS unlink-libexecPROGRAMS filelist-libexecPROGRAMS link-libexecSCRIPTS unlink-libexecSCRIPTS filelist-libexecSCRIPTS link-etcDATA unlink-etcDATA filelist-etcDATA link-binPROGRAMS unlink-binPROGRAMS filelist-binPROGRAMS link-binSCRIPTS unlink-binSCRIPTS filelist-binSCRIPTS link-sbinPROGRAMS unlink-sbinPROGRAMS filelist-sbinPROGRAMS link-sbinSCRIPTS unlink-sbinSCRIPTS filelist-sbinSCRIPTS link-includeHEADERS unlink-includeHEADERS filelist-includeHEADERS link-shareDATA unlink-shareDATA filelist-shareDATA link-setupDATA unlink-setupDATA filelist-setupDATA link-setupPROGRAMS unlink-setupPROGRAMS filelist-setupPROGRAMS link-setupSCRIPTS unlink-setupSCRIPTS filelist-setupSCRIPTS link-testDATA unlink-testDATA filelist-testDATA link-testPROGRAMS unlink-testPROGRA
 MS filelist-testPROGRAMS link-testSCRIPTS unlink-testSCRIPTS filelist-testSCRIPTS link-scriptsysconfPROGRAMS unlink-scriptsysconfPROGRAMS filelist-scriptsysconfPROGRAMS link-scriptsysconfSCRIPTS unlink-scriptsysconfSCRIPTS filelist-scriptsysconfSCRIPTS link-flavorincludeHEADERS unlink-flavorincludeHEADERS filelist-flavorincludeHEADERS link-pkgDATA unlink-pkgDATA filelist-pkgDATA link-aclocalDATA unlink-aclocalDATA filelist-aclocalDATA link-perlmoduleDATA unlink-perlmoduleDATA filelist-perlmoduleDATA link-doxygenDATA unlink-doxygenDATA filelist-doxygenDATA link-docDATA unlink-docDATA filelist-docDATA 
 
-filelist: filelist-recursive filelist-libLTLIBRARIES filelist-libLIBRARIES filelist-libexecPROGRAMS filelist-libexecSCRIPTS filelist-etcDATA filelist-binPROGRAMS filelist-binSCRIPTS filelist-sbinPROGRAMS filelist-sbinSCRIPTS filelist-includeHEADERS filelist-shareDATA filelist-setupDATA filelist-setupPROGRAMS filelist-setupSCRIPTS filelist-testDATA filelist-testPROGRAMS filelist-testSCRIPTS filelist-scriptsysconfPROGRAMS filelist-scriptsysconfSCRIPTS filelist-flavorincludeHEADERS filelist-pkgDATA filelist-aclocalDATA filelist-doxygenDATA filelist-docDATA 
+filelist: filelist-recursive filelist-libLTLIBRARIES filelist-libLIBRARIES filelist-libexecPROGRAMS filelist-libexecSCRIPTS filelist-etcDATA filelist-binPROGRAMS filelist-binSCRIPTS filelist-sbinPROGRAMS filelist-sbinSCRIPTS filelist-includeHEADERS filelist-shareDATA filelist-setupDATA filelist-setupPROGRAMS filelist-setupSCRIPTS filelist-testDATA filelist-testPROGRAMS filelist-testSCRIPTS filelist-scriptsysconfPROGRAMS filelist-scriptsysconfSCRIPTS filelist-flavorincludeHEADERS filelist-pkgDATA filelist-aclocalDATA filelist-perlmoduleDATA filelist-doxygenDATA filelist-docDATA 
 	:
 
 
@@ -1097,6 +1097,59 @@
 
 
 
+link-perlmoduleDATA: $(perlmodule_DATA)
+	@$(NORMAL_INSTALL)
+	@$(mkinstalldirs) $(DESTDIR)$(perlmoduledir)
+	@list='$(perlmodule_DATA)'; for p in $$list; do \
+	  mydir=`pwd`; \
+	  target_p=$(DESTDIR)$(perlmoduledir)/$$p; \
+	  if test -f $(srcdir)/$$p; then \
+		cd $(srcdir); \
+		fullsrcdir=`pwd`; \
+		cd $$mydir; \
+		if test -f $$target_p -a ! -h $$target_p; then \
+			echo "mv $$target_p $$target_p.$(LINK_BAK)"; \
+			mv $$target_p $$target_p.$(LINK_BAK); \
+		fi; \
+		if test ! -h $$target_p; then \
+			echo "ln -s $$fullsrcdir/$$p $$target_p"; \
+			ln -s $$fullsrcdir/$$p $$target_p; \
+		fi; \
+	  else if test -f $$p; then \
+		if test -f $$target_p -a ! -h $$target_p; then \
+			echo "mv $$target_p $$target_p.$(LINK_BAK)"; \
+			mv $$target_p $$target_p.$(LINK_BAK); \
+		fi; \
+		if test ! -h $$target_p; then \
+			echo "ln -s $$mydir/$$p $$target_p"; \
+			ln -s $$mydir/$$p $$target_p; \
+		fi; \
+	  fi; fi; \
+	done
+
+unlink-perlmoduleDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(perlmodule_DATA)'; for p in $$list; do \
+	target_p=$(DESTDIR)$(perlmoduledir)/$$p; \
+	if test -h $$target_p; then \
+		echo "rm $$target_p"; \
+		rm $$target_p; \
+	fi; \
+	if test -f $$target_p.$(LINK_BAK); then \
+		echo "mv $$target_p.$(LINK_BAK) $$target_p"; \
+		mv $$target_p.$(LINK_BAK) $$target_p; \
+	fi; \
+	done
+
+filelist-perlmoduleDATA:
+	@list='$(perlmodule_DATA)'; for p in $$list; do \
+	  echo "$(DESTDIR)$(perlmoduledir)/$$p" >> $(FILELIST_FILE); \
+	done
+
+
+
+
+
 link-doxygenDATA: $(doxygen_DATA)
 	@$(NORMAL_INSTALL)
 	@$(mkinstalldirs) $(DESTDIR)$(doxygendir)
diff -Nur globus_core-5.15.orig/aclocal/automake_targets globus_core-5.15/aclocal/automake_targets
--- globus_core-5.15.orig/aclocal/automake_targets	2002-07-03 21:19:28.000000000 +0200
+++ globus_core-5.15/aclocal/automake_targets	2008-10-12 14:40:31.000000000 +0200
@@ -1,30 +1,30 @@
 ## Special globus installation directories
 
-setupdir = $(GLOBUS_LOCATION)/setup/globus
+setupdir = @setupdir@
 ## setup = [ DATA,PROGRAMS,SCRIPTS ]
 
-testdir = $(GLOBUS_LOCATION)/test/$(PACKAGE)
+testdir = @testdir@
 ## test = [ DATA,PROGRAMS,SCRIPTS ]
 
-scriptsysconfdir = $(GLOBUS_LOCATION)/etc
+scriptsysconfdir = ${sysconfdir}
 ## scriptsysconf = [ PROGRAMS,SCRIPTS ]
 
-flavorincludedir = $(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOR_NAME)
+flavorincludedir = @flavorincludedir@
 ## flavorinclude = [ HEADERS ]
 
-pkgdir = $(GLOBUS_LOCATION)/etc/globus_packages/$(PACKAGE)
+pkgdir = @pkgdir@
 ## pkg = [ DATA ]
 
-aclocaldir = $(GLOBUS_LOCATION)/share/globus_aclocal
+aclocaldir = @aclocaldir@
 ## aclocal = [ DATA ]
 
-amdirdir = $(GLOBUS_LOCATION)/share/globus_amdir
-## amdir = [ DATA ]
+perlmoduledir = @perlmoduledir@
+## perlmodule = [ DATA ]
 
-doxygendir = $(GLOBUS_LOCATION)/share/doxygen
+doxygendir = @doxygendir@
 ## doxygen = [ DATA ]
 
-docdir = $(GLOBUS_LOCATION)/share/doc
+docdir = ${datadir}/doc
 ## doc = [ DATA ]
 
 LINK_BAK = orig
diff -Nur globus_core-5.15.orig/aclocal/Doxyfile.in globus_core-5.15/aclocal/Doxyfile.in
--- globus_core-5.15.orig/aclocal/Doxyfile.in	2004-03-14 07:29:13.000000000 +0100
+++ globus_core-5.15/aclocal/Doxyfile.in	2008-10-12 14:40:31.000000000 +0200
@@ -13,7 +13,7 @@
 # Include the standard part of the doxygen configuration:
 #
 
- at INCLUDE_PATH = @prefix@/share/doxygen
+ at INCLUDE_PATH = @doxygendir@
 
 @INCLUDE = Doxyfile.include
 
@@ -64,27 +64,27 @@
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            = @prefix@/share/doxygen/globus_head.html
+HTML_HEADER            = @doxygendir@/globus_head.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = @prefix@/share/doxygen/globus_foot.html
+HTML_FOOTER            = @doxygendir@/globus_foot.html
 
 # The HTML_STYLESHEET tag can be used to specify a user defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet 
 
-HTML_STYLESHEET        = @prefix@/share/doxygen/globus.css
+HTML_STYLESHEET        = @doxygendir@/globus.css
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
 # the generated latex document. The header should contain everything until 
 # the first chapter. If it is left blank doxygen will generate a 
 # standard header. Notice: only use this tag if you know what you are doing! 
 
-LATEX_HEADER           = @prefix@/share/doxygen/globus_head.tex
+LATEX_HEADER           = @doxygendir@/globus_head.tex
 
 # The PREDEFINED tag can be used to specify one or more macro names that 
 # are defined before the preprocessor is started (similar to the -D option of 
diff -Nur globus_core-5.15.orig/aclocal/Doxyfile-internal.in globus_core-5.15/aclocal/Doxyfile-internal.in
--- globus_core-5.15.orig/aclocal/Doxyfile-internal.in	2004-03-14 07:29:13.000000000 +0100
+++ globus_core-5.15/aclocal/Doxyfile-internal.in	2008-10-12 14:40:31.000000000 +0200
@@ -13,7 +13,7 @@
 # Include the standard part of the doxygen configuration:
 #
 
- at INCLUDE_PATH = @prefix@/share/doxygen
+ at INCLUDE_PATH = @doxygendir@
 
 @INCLUDE = Doxyfile-internal.include
 
@@ -65,27 +65,27 @@
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            = @prefix@/share/doxygen/globus_head.html
+HTML_HEADER            = @doxygendir@/globus_head.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = @prefix@/share/doxygen/globus_foot.html
+HTML_FOOTER            = @doxygendir@/globus_foot.html
 
 # The HTML_STYLESHEET tag can be used to specify a user defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet 
 
-HTML_STYLESHEET        = @prefix@/share/doxygen/globus.css
+HTML_STYLESHEET        = @doxygendir@/globus.css
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
 # the generated latex document. The header should contain everything until 
 # the first chapter. If it is left blank doxygen will generate a 
 # standard header. Notice: only use this tag if you know what you are doing! 
 
-LATEX_HEADER           = @prefix@/share/doxygen/globus_head.tex
+LATEX_HEADER           = @doxygendir@/globus_head.tex
 
 # The PREDEFINED tag can be used to specify one or more macro names that 
 # are defined before the preprocessor is started (similar to the -D option of 
diff -Nur globus_core-5.15.orig/aclocal/globus_package.m4 globus_core-5.15/aclocal/globus_package.m4
--- globus_core-5.15.orig/aclocal/globus_package.m4	2005-11-02 23:25:24.000000000 +0100
+++ globus_core-5.15/aclocal/globus_package.m4	2008-10-12 14:40:31.000000000 +0200
@@ -70,13 +70,21 @@
 
 # get the environment scripts
 
-if test "x$GLOBUS_FLAVOR_NAME" != "xnoflavor" ; then
-	. $GLOBUS_LOCATION/libexec/globus-build-env-$GLOBUS_FLAVOR_NAME.sh
-fi
+. $GLOBUS_LOCATION/libexec/globus-build-env-$GLOBUS_FLAVOR_NAME.sh
 
 prefix='$(GLOBUS_LOCATION)'
 exec_prefix='$(GLOBUS_LOCATION)'
 
+# doxygendir must have absolute path...
+saveprefix=$prefix
+if test x$prefix = "xNONE" ; then
+    prefix=$ac_default_prefix
+fi
+while echo "$doxygendir" | grep -q '\$' ; do
+    eval doxygendir=$doxygendir
+done
+prefix=$saveprefix
+
 AC_SUBST(CC)
 AC_SUBST(CPP)
 AC_SUBST(CFLAGS)
@@ -102,6 +110,13 @@
 AC_SUBST(OBJEXT)
 AC_SUBST(EXEEXT)
 AC_SUBST(OBJECT_MODE)
+AC_SUBST(setupdir)
+AC_SUBST(testdir)
+AC_SUBST(flavorincludedir)
+AC_SUBST(pkgdir)
+AC_SUBST(aclocaldir)
+AC_SUBST(perlmoduledir)
+AC_SUBST(doxygendir)
 
 
 define([AM_PROG_LIBTOOL],[
diff -Nur globus_core-5.15.orig/config/accompiler.m4 globus_core-5.15/config/accompiler.m4
--- globus_core-5.15.orig/config/accompiler.m4	2008-03-04 01:39:39.000000000 +0100
+++ globus_core-5.15/config/accompiler.m4	2008-10-12 14:48:41.000000000 +0200
@@ -171,10 +171,26 @@
 dnl LAC_COMPILERS_SET_ALL_VARS(THREAD-TYPE)
 AC_DEFUN([LAC_COMPILERS_SET_ALL_VARS],
 [
+lac_includedir='$includedir'
+while echo "$lac_includedir" | grep -q '\$' ; do
+    eval lac_includedir=$lac_includedir
+done
+lac_includedir=`echo $lac_includedir | sed s!^NONE!$ac_default_prefix!`
+lac_flavorincludedir='$flavorincludedir'
+while echo "$lac_flavorincludedir" | grep -q '\$' ; do
+    eval lac_flavorincludedir=$lac_flavorincludedir
+done
+lac_flavorincludedir=`echo $lac_flavorincludedir | sed s!^NONE!$ac_default_prefix!`
+lac_libdir='$libdir'
+while echo "$lac_libdir" | grep -q '\$' ; do
+    eval lac_libdir=$lac_libdir
+done
+lac_libdir=`echo $lac_libdir | sed s!^NONE!$ac_default_prefix!`
+
 lac_CFLAGS="$CFLAGS "
-lac_CPPFLAGS="$CPPFLAGS -I$GLOBUS_LOCATION/include -I$GLOBUS_LOCATION/include/$globus_cv_flavor"
+lac_CPPFLAGS="$CPPFLAGS -I$lac_includedir -I$lac_flavorincludedir"
 lac_CXXFLAGS="$CXXFLAGS "
-lac_LDFLAGS="$LDFLAGS -L$GLOBUS_LOCATION/lib"
+lac_LDFLAGS="$LDFLAGS -L$lac_libdir"
 lac_LIBS="$LIBS "
 lac_F77FLAGS="$F77FLAGS "
 lac_F90FLAGS="$F90FLAGS "
diff -Nur globus_core-5.15.orig/configure.in globus_core-5.15/configure.in
--- globus_core-5.15.orig/configure.in	2005-07-28 21:38:23.000000000 +0200
+++ globus_core-5.15/configure.in	2008-10-12 14:41:21.000000000 +0200
@@ -46,6 +46,101 @@
      -o "$globus_cv_flavor" = "yes" ; then
     AC_MSG_ERROR([A flavor description string must be specified!])
 fi
+  
+AC_ARG_WITH([setupdir],
+AC_HELP_STRING([--with-setupdir=DIR],
+[setup installation directory [[PREFIX/setup/globus]]]),
+[
+    if test x$withval = "xno" -o x$withval = "xyes" ; then
+        AC_MSG_ERROR([--with-setupdir requires an argument])
+    fi
+    setupdir=$withval
+],
+[
+    setupdir='${prefix}/setup/globus'
+])
+AC_SUBST(setupdir)
+
+AC_ARG_WITH([testdir],
+AC_HELP_STRING([--with-testdir=DIR],
+[test installation directory [[PREFIX/test/PACKAGE]]]),
+[
+    if test x$withval = "xno" -o x$withval = "xyes" ; then
+        AC_MSG_ERROR([--with-testdir requires an argument])
+    fi
+    testdir=$withval
+],
+[
+    testdir='${prefix}/test/${PACKAGE}'
+])
+AC_SUBST(testdir)
+
+AC_ARG_WITH([flavorincludedir],
+AC_HELP_STRING([--with-flavorincludedir=DIR],
+[flavored header installation directory [[INCLUDEDIR/FLAVOR]]]),
+[
+    if test x$withval = "xno" -o x$withval = "xyes" ; then
+        AC_MSG_ERROR([--with-flavorincludedir requires an argument])
+    fi
+    flavorincludedir=$withval
+],
+[
+    flavorincludedir='${includedir}/${GLOBUS_FLAVOR_NAME}'
+])
+AC_SUBST(flavorincludedir)
+
+AC_ARG_WITH([perlmoduledir],
+AC_HELP_STRING([--with-perlmoduledir=DIR],
+[perl module directory [[PREFIX/lib/perl]]]),
+[
+    if test x$withval = "xno" -o x$withval = "xyes" ; then
+        AC_MSG_ERROR([--with-perlmoduledir requires an argument])
+    fi
+    perlmoduledir=$withval
+],
+[
+    perlmoduledir='${prefix}/lib/perl'
+])
+AC_SUBST(perlmoduledir)
+
+AC_ARG_WITH([doxygendir],
+AC_HELP_STRING([--with-doxygendir=DIR],
+[doxygen installation directory [[DATADIR/doxygen]]]),
+[
+    if test x$withval = "xno" -o x$withval = "xyes" ; then
+        AC_MSG_ERROR([--with-doxygendir requires an argument])
+    fi
+    doxygendir=$withval
+],
+[
+    doxygendir='${datadir}/doxygen'
+])
+AC_SUBST(doxygendir)
+
+AC_ARG_WITH([newgpt],
+AC_HELP_STRING([--with-newgpt], [Use installation paths from new GPT]),
+[
+    if test x$withval = "xno" ; then
+        aclocaldir='${datadir}/globus_aclocal'
+        pkgdir='${sysconfdir}/globus_packages/${PACKAGE}'
+        flavordir='${sysconfdir}/globus_core'
+    else
+        aclocaldir='${datadir}/globus/aclocal'
+        pkgdir='${datadir}/globus/packages/${PACKAGE}'
+        flavordir='${datadir}/globus/flavors'
+    fi
+],
+[
+    aclocaldir='${datadir}/globus_aclocal'
+    pkgdir='${sysconfdir}/globus_packages/${PACKAGE}'
+    flavordir='${sysconfdir}/globus_core'
+])
+AC_SUBST(aclocaldir)
+AC_SUBST(pkgdir)
+AC_SUBST(flavordir)
+
+GLOBUS_FLAVOR_NAME=$globus_cv_flavor
+AC_SUBST(GLOBUS_FLAVOR_NAME)
 
 LAC_COMPILERS
 LAC_TARGET_ARCH
@@ -62,9 +157,6 @@
     AC_DEFINE(BUILD_STATIC_ONLY)
 fi
 
-GLOBUS_FLAVOR_NAME=$globus_cv_flavor
-AC_SUBST(GLOBUS_FLAVOR_NAME)
-
 dnl define FILELIST_FILE variable
 FILELIST_FILE=`pwd`;
 FILELIST_FILE="$FILELIST_FILE/pkgdata/master.filelist"
@@ -125,7 +217,8 @@
 fi
 
 AC_OUTPUT(Makefile
-       	scripts/globus-build-env-$GLOBUS_FLAVOR_NAME.sh:scripts/globus-build-env.sh.in
+	scripts/globus-build-env-$GLOBUS_FLAVOR_NAME.sh:scripts/globus-build-env.sh.in
+	scripts/globus-build-env-noflavor.sh
 	scripts/Makefile
 	aclocal/Makefile
 	aclocal/automake_config
diff -Nur globus_core-5.15.orig/pkgdata/Makefile.am globus_core-5.15/pkgdata/Makefile.am
--- globus_core-5.15.orig/pkgdata/Makefile.am	2006-01-12 18:12:52.000000000 +0100
+++ globus_core-5.15/pkgdata/Makefile.am	2008-10-12 14:40:31.000000000 +0200
@@ -1,6 +1,6 @@
 include $(top_srcdir)/aclocal/automake_targets
 
-flavordir = $(GLOBUS_LOCATION)/etc/$(PACKAGE)
+flavordir = @flavordir@
 
 FILELIST_FILES = noflavor_data.filelist \
 	$(GLOBUS_FLAVOR_NAME)_dev.filelist \
diff -Nur globus_core-5.15.orig/scripts/globus-build-env-noflavor.sh.in globus_core-5.15/scripts/globus-build-env-noflavor.sh.in
--- globus_core-5.15.orig/scripts/globus-build-env-noflavor.sh.in	1970-01-01 01:00:00.000000000 +0100
+++ globus_core-5.15/scripts/globus-build-env-noflavor.sh.in	2008-10-12 14:40:31.000000000 +0200
@@ -0,0 +1,9 @@
+libexecdir='@libexecdir@'
+setupdir='@setupdir@'
+testdir='@testdir@'
+includedir='@includedir@'
+flavorincludedir='@flavorincludedir@'
+pkgdir='@pkgdir@'
+aclocaldir='@aclocaldir@'
+perlmoduledir='@perlmoduledir@'
+doxygendir='@doxygendir@'
diff -Nur globus_core-5.15.orig/scripts/globus-build-env.sh.in globus_core-5.15/scripts/globus-build-env.sh.in
--- globus_core-5.15.orig/scripts/globus-build-env.sh.in	2006-01-19 06:54:29.000000000 +0100
+++ globus_core-5.15/scripts/globus-build-env.sh.in	2008-10-12 14:40:31.000000000 +0200
@@ -61,3 +61,13 @@
 GLOBUS_THREADS="@GLOBUS_THREADS@"
 GLOBUS_HOST="@GLOBUS_HOST@"
 GLOBUS_DEBUG="@GLOBUS_DEBUG@"
+
+libexecdir='@libexecdir@'
+setupdir='@setupdir@'
+testdir='@testdir@'
+includedir='@includedir@'
+flavorincludedir='@flavorincludedir@'
+pkgdir='@pkgdir@'
+aclocaldir='@aclocaldir@'
+perlmoduledir='@perlmoduledir@'
+doxygendir='@doxygendir@'
diff -Nur globus_core-5.15.orig/scripts/Makefile.am globus_core-5.15/scripts/Makefile.am
--- globus_core-5.15.orig/scripts/Makefile.am	2002-09-24 23:34:09.000000000 +0200
+++ globus_core-5.15/scripts/Makefile.am	2008-10-12 14:40:31.000000000 +0200
@@ -1,8 +1,10 @@
 include $(top_srcdir)/aclocal/automake_targets
 libexec_SCRIPTS = \
 	globus-build-env-$(GLOBUS_FLAVOR_NAME).sh \
+	globus-build-env-noflavor.sh \
 	globus-bootstrap.sh
 
 EXTRA_DIST = \
 	globus-build-env.sh.in \
+	globus-build-env-noflavor.sh.in \
 	globus-bootstrap.sh

globus-core-doxygen.patch:

--- NEW FILE globus-core-doxygen.patch ---
diff -ur globus_core-5.14.orig/aclocal/Doxyfile.in globus_core-5.14/aclocal/Doxyfile.in
--- globus_core-5.14.orig/aclocal/Doxyfile.in	2008-10-08 10:33:48.000000000 +0200
+++ globus_core-5.14/aclocal/Doxyfile.in	2008-10-08 10:50:16.000000000 +0200
@@ -77,14 +77,14 @@
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet 
 
-HTML_STYLESHEET        = @doxygendir@/globus.css
+HTML_STYLESHEET        = 
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
 # the generated latex document. The header should contain everything until 
 # the first chapter. If it is left blank doxygen will generate a 
 # standard header. Notice: only use this tag if you know what you are doing! 
 
-LATEX_HEADER           = @doxygendir@/globus_head.tex
+LATEX_HEADER           = 
 
 # The PREDEFINED tag can be used to specify one or more macro names that 
 # are defined before the preprocessor is started (similar to the -D option of 
diff -ur globus_core-5.14.orig/aclocal/Doxyfile-internal.in globus_core-5.14/aclocal/Doxyfile-internal.in
--- globus_core-5.14.orig/aclocal/Doxyfile-internal.in	2008-10-08 10:33:48.000000000 +0200
+++ globus_core-5.14/aclocal/Doxyfile-internal.in	2008-10-08 10:50:51.000000000 +0200
@@ -78,14 +78,14 @@
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet 
 
-HTML_STYLESHEET        = @doxygendir@/globus.css
+HTML_STYLESHEET        = 
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
 # the generated latex document. The header should contain everything until 
 # the first chapter. If it is left blank doxygen will generate a 
 # standard header. Notice: only use this tag if you know what you are doing! 
 
-LATEX_HEADER           = @doxygendir@/globus_head.tex
+LATEX_HEADER           = 
 
 # The PREDEFINED tag can be used to specify one or more macro names that 
 # are defined before the preprocessor is started (similar to the -D option of 
diff -ur globus_core-5.14.orig/aclocal/doxygen_Makefile.am globus_core-5.14/aclocal/doxygen_Makefile.am
--- globus_core-5.14.orig/aclocal/doxygen_Makefile.am	2002-01-04 17:41:38.000000000 +0100
+++ globus_core-5.14/aclocal/doxygen_Makefile.am	2008-10-08 14:53:41.000000000 +0200
@@ -12,28 +12,35 @@
 		        $(PERL) ./doc/html/installdox $(doxygen_installdox) ./doc/html/*;\
 		    fi ; \
 		fi ; \
+		if test -d doc/latex; then \
+		    (cd doc/latex ; for f in *.tex ; do sed 's/\\doxyref{/{\\bf /g' < $$f > $$f.new ; mv $$f.new $$f ; done ; make) ; \
+		fi \
 	fi
 
 install-data-local:
 	@if test ! -z "@DOXYGEN@"; then                     \
-		for dir in `find ./doc/* -type d -print|sed "s,./doc/,,"`; do \
+		for dir in `find ./doc/{html,man} -type d -print|sed "s,./doc/,,"`; do \
 			if test -z "`echo $${dir}|sed -n '/^man/ p'`"; then \
 				$(INSTALL) -d -m 755 \
 					$(DESTDIR)$(docdir)/@PACKAGE@/$${dir}; \
 			else \
 				$(INSTALL) -d -m 755 \
-					$(DESTDIR)$(prefix)/$${dir}; \
+					$(DESTDIR)$(mandir)/../$${dir}; \
 			fi \
 		done; \
-		for file in `find ./doc -type f -print|sed "s,./doc/,,"`; do \
+		for file in `find ./doc/{html,man} -type f -print|sed "s,./doc/,,"`; do \
 			if test -z "`echo $${file}|sed -n '/^man/ p'`"; then \
 				$(INSTALL) -m 644 ./doc/$${file} \
 					$(DESTDIR)$(docdir)/@PACKAGE@/$${file}; \
 			else \
 				$(INSTALL) -m 644 ./doc/$${file} \
-					$(DESTDIR)$(prefix)/$${file};\
+					$(DESTDIR)$(mandir)/../$${file};\
 			fi \
-		done \
+		done; \
+		if test -f doc/latex/refman.pdf; then \
+			$(INSTALL) -m 644 doc/latex/refman.pdf \
+				$(DESTDIR)$(docdir)/@PACKAGE@; \
+		fi \
 	fi
 
 clean-data-local:
@@ -43,10 +50,13 @@
 
 filelist:
 	@if test ! -z "@DOXYGEN@"; then \
-		find ./doc -type f -print| \
-		sed "s,./doc/man,$(prefix)/man,"| \
+		find ./doc/{man,html} -type f -print| \
+		sed "s,./doc/man,$(mandir),"| \
 		sed "s,./doc,$(docdir)/@PACKAGE@," \
 		>> $(FILELIST_FILE); \
+		if test -f doc/latex/refman.pdf; then \
+			echo $(docdir)/@PACKAGE@/refman.pdf >> $(FILELIST_FILE); \
+		fi \
 	fi
 
 dist-hook: all-local
diff -ur globus_core-5.14.orig/doxygen/Doxyfile.include globus_core-5.14/doxygen/Doxyfile.include
--- globus_core-5.14.orig/doxygen/Doxyfile.include	2004-03-14 07:29:15.000000000 +0100
+++ globus_core-5.14/doxygen/Doxyfile.include	2008-10-08 10:34:25.000000000 +0200
@@ -451,7 +451,7 @@
 # by the printer. Possible values are: a4, a4wide, letter, legal and 
 # executive. If left blank a4wide will be used.
 
-PAPER_TYPE             = letter
+PAPER_TYPE             = 
 
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
 # packages that should be included in the LaTeX output.
@@ -477,7 +477,7 @@
 # plain latex in the generated Makefile. Set this option to YES to get a 
 # higher quality PDF documentation.
 
-USE_PDFLATEX           = NO
+USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
 # command to the generated LaTeX files. This will instruct LaTeX to keep 
@@ -547,7 +547,7 @@
 # only source the real man page, but without them the man command 
 # would be unable to find the correct page. The default is NO.
 
-MAN_LINKS              = YES
+MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor   
diff -ur globus_core-5.14.orig/doxygen/Doxyfile-internal.include globus_core-5.14/doxygen/Doxyfile-internal.include
--- globus_core-5.14.orig/doxygen/Doxyfile-internal.include	2004-03-14 07:29:15.000000000 +0100
+++ globus_core-5.14/doxygen/Doxyfile-internal.include	2008-10-08 10:35:32.000000000 +0200
@@ -436,7 +436,7 @@
 # by the printer. Possible values are: a4, a4wide, letter, legal and 
 # executive. If left blank a4wide will be used. 
 
-PAPER_TYPE             = letter
+PAPER_TYPE             = 
 
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
 # packages that should be included in the LaTeX output. 
diff -ur globus_core-5.14.orig/doxygen/globus_head.html globus_core-5.14/doxygen/globus_head.html
--- globus_core-5.14.orig/doxygen/globus_head.html	2001-04-17 20:51:29.000000000 +0200
+++ globus_core-5.14/doxygen/globus_head.html	2008-10-08 10:48:54.000000000 +0200
@@ -1,9 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html><head><meta name="robots" content="noindex">
+<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <!-- THIS FILE IS AUTOMATICALLY GENERATED FROM THE GLOBUS SOURCE CODE
      DO NOT MODIFY.
 -->
 <title>Globus Reference Manual</title>
-<link href="globus.css" title="Globus" rel="stylesheet" type="text/css">
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head>
 <body>
diff -ur globus_core-5.14.orig/doxygen/Makefile.am globus_core-5.14/doxygen/Makefile.am
--- globus_core-5.14.orig/doxygen/Makefile.am	2005-12-07 10:37:42.000000000 +0100
+++ globus_core-5.14/doxygen/Makefile.am	2008-10-08 10:54:20.000000000 +0200
@@ -2,10 +2,8 @@
 
 doxygen_DATA = Doxyfile-internal.include \
 	Doxyfile.include \
-	globus.css \
 	globus_foot.html \
-	globus_head.html \
-	globus_head.tex
+	globus_head.html
 
 sbin_SCRIPTS = \
     globus-build-doxygen-dependencies \

globus-core-fedora.patch:

--- NEW FILE globus-core-fedora.patch ---
diff -ur globus_core-5.15.orig/doxygen/globus-build-doxygen-dependencies globus_core-5.15/doxygen/globus-build-doxygen-dependencies
--- globus_core-5.15.orig/doxygen/globus-build-doxygen-dependencies	2008-10-21 09:57:03.000000000 +0200
+++ globus_core-5.15/doxygen/globus-build-doxygen-dependencies	2008-10-21 10:09:07.000000000 +0200
@@ -77,7 +77,14 @@
 pod2usage('Must specify src_metadata_file') if !defined($srcfile);
 
 @deps = process_package($srcfile);
-print join(' ', map {"$prefix/share/doc/$_/html/$_.tag"} @deps) . "\n";
+foreach (@deps) {
+    my $pkg = new Grid::GPT::V1::Package;
+    $pkg->read_metadata_file("$prefix/share/globus/packages/$_/pkg_data_noflavor_doc.gpt");
+    my $dir = "$_-$pkg->{'Version'}->{'major'}.$pkg->{'Version'}->{'minor'}";
+    $dir =~ s/_/-/g;
+    $_ = "$prefix/share/doc/$dir/html/$_.tag";
+}
+print join(' ', @deps) . "\n";
 
 sub process_package($)
 {

globus-core-func.patch:

--- NEW FILE globus-core-func.patch ---
--- globus-core-4.34.orig/config/acsystem.m4	2007-02-09 09:22:58.000000000 +0100
+++ globus-core-4.34/config/acsystem.m4	2008-06-21 09:29:04.000000000 +0200
@@ -253,6 +253,9 @@
 AC_CHECK_FUNCS(geteuid)
 AC_CHECK_FUNCS(getpwnam)
 AC_CHECK_FUNCS(getpwuid)
+AC_CHECK_FUNCS(vsnprintf)
+AC_CHECK_FUNCS(snprintf)
+AC_CHECK_FUNCS(strncasecmp)
 
 dnl used in RSL
 AC_FUNC_ALLOCA

globus-core-gnusource.patch:

--- NEW FILE globus-core-gnusource.patch ---
diff -ur globus_core-5.15.orig/configure.in globus_core-5.15/configure.in
--- globus_core-5.15.orig/configure.in	2008-10-11 21:48:29.000000000 +0200
+++ globus_core-5.15/configure.in	2008-10-11 21:49:04.000000000 +0200
@@ -8,6 +8,8 @@
 
 ac_default_prefix=${GLOBUS_LOCATION:-$ac_default_prefix}
 
+AC_GNU_SOURCE
+
 # save CC and CFLAGS, so AC_PROG_CC can detect and use a compiler
 # up to the point where we want to pick a compiler based on the
 # flavor  (see config/accompiler.m4)
diff -ur globus_core-5.15.orig/globus_config.h.in globus_core-5.15/globus_config.h.in
--- globus_core-5.15.orig/globus_config.h.in	2007-02-20 22:15:34.000000000 +0100
+++ globus_core-5.15/globus_config.h.in	2008-10-11 21:49:04.000000000 +0200
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#ifndef _GNU_SOURCE
+#undef _GNU_SOURCE
+#endif
+
 #undef HAVE_EXTERNALTHREADS
 #undef HAVE_PTHREAD
 #undef HAVE_PTHREAD_DRAFT_10

globus-core-helpstring.patch:

--- NEW FILE globus-core-helpstring.patch ---
diff -ur globus_core-5.14.orig/aclocal/acdoxygen.m4 globus_core-5.14/aclocal/acdoxygen.m4
--- globus_core-5.14.orig/aclocal/acdoxygen.m4	2004-08-24 17:37:02.000000000 +0200
+++ globus_core-5.14/aclocal/acdoxygen.m4	2008-10-05 21:47:10.000000000 +0200
@@ -65,9 +65,7 @@
 AC_DEFUN([LAC_DOXYGEN],dnl
 [
     AC_ARG_ENABLE(doxygen,
-    changequote(<<, >>)dnl  
-<< --enable-doxygen[=PATH]     use Doxygen to generate documentation>>,
-    changequote([, ])dnl
+    AC_HELP_STRING([--enable-doxygen[[=PATH]]], [use Doxygen to generate documentation]),
     [
         if test "$enableval" = "yes"; then
         AC_PATH_PROG(DOXYGEN,
@@ -87,8 +85,7 @@
 
 
     AC_ARG_ENABLE(internal-doc,
-    [ --enable-internal-doc        Generate Doxygen documentation for
-                   internal functions. Requires --enable-doxygen],
+    AC_HELP_STRING([--enable-internal-doc], [Generate Doxygen documentation for internal functions. Requires --enable-doxygen]),
     [
     DOXYFILE="Doxyfile-internal"
     AC_SUBST(DOXYFILE) 
diff -ur globus_core-5.14.orig/aclocal/globus_package.m4 globus_core-5.14/aclocal/globus_package.m4
--- globus_core-5.14.orig/aclocal/globus_package.m4	2005-11-02 23:25:24.000000000 +0100
+++ globus_core-5.14/aclocal/globus_package.m4	2008-10-05 17:45:04.000000000 +0200
@@ -24,7 +24,8 @@
 fi
 
 AC_ARG_WITH(flavor,
-	[ --with-flavor=<FL>     Specify the globus build flavor or without-flavor for a flavor independent  ],
+	AC_HELP_STRING([--with-flavor=FLAVOR],
+	[Specify the globus build flavor or --without-flavor for a flavor independent package]),
 
 	[
 	case $withval in
@@ -132,7 +133,7 @@
 
 
 AC_ARG_ENABLE([programs],
-[   --disable-programs    Don't compile/link programs],
+    AC_HELP_STRING([--disable-programs], [Don't compile/link programs]),
     [case "${enableval}" in
         yes) 
             ENABLE_PROGRAMS=true
@@ -157,9 +158,7 @@
 lac_INSURE=$INSURE
 
 AC_ARG_ENABLE(insure,
- 	changequote(<<, >>)dnl
-  <<--disable-insure	disable Insure++ >>,
-	changequote([, ])dnl
+	AC_HELP_STRING([--disable-insure], [disable Insure++]),
 	[
 		if test "$enableval" = "yes"; then
 			lac_INSURE="${INSURE-insure}"
diff -ur globus_core-5.14.orig/config/accompiler.m4 globus_core-5.14/config/accompiler.m4
--- globus_core-5.14.orig/config/accompiler.m4	2008-03-04 01:39:39.000000000 +0100
+++ globus_core-5.14/config/accompiler.m4	2008-10-05 17:52:38.000000000 +0200
@@ -69,31 +69,29 @@
 AC_DEFUN([LAC_COMPILERS_ARGS],
 [
 AC_ARG_WITH(threads,
-        [  --with-threads=TYPE          build target with threads],
+        AC_HELP_STRING([--with-threads=TYPE], [build target with threads]),
         [lac_cv_threads_type="$withval"],
         [lac_cv_threads_type=${lac_cv_threads_type='no'}])
 
 LAC_THREADS_ARGS
 
 AC_ARG_ENABLE(debug,
-        [  --enable-debug                compile in debugging features],
+        AC_HELP_STRING([--enable-debug], [compile in debugging features]),
         [lac_cv_debug="$enableval"],
         [lac_cv_debug=${lac_cv_debug='no'}])
 
 AC_ARG_ENABLE(64bit,
-        [  --enable-64bit                build 64-bit objects (SGI Irix 6.x, HP HPUX 11.x, IA-64 only)],
+        AC_HELP_STRING([--enable-64bit], [build 64-bit objects (SGI Irix 6.x, HP HPUX 11.x, IA-64 only)]),
         [lac_cv_build_64bit="$enableval"],
         [lac_cv_build_64bit=${lac_cv_build_64bit='no'}])
 
 AC_ARG_ENABLE(profiling,
-        [  --enable-profiling            enable profile build (GCC only)],
+        AC_HELP_STRING([--enable-profiling], [enable profile build (GCC only)]),
         [lac_cv_build_profile="$enableval"],
         [lac_cv_build_profile=${lac_cv_build_profile='no'}])
 
 AC_ARG_ENABLE(insure,
-        changequote(<<, >>)dnl
-  <<--enable-insure[=PATH]      use Insure++ [default=insure]>>,
-        changequote([, ])dnl
+        AC_HELP_STRING([--enable-insure[[=PATH]]], [use Insure++ [[default=insure]]]),
         [
                 if test "$enableval" = "yes"; then
                         lac_cv_INSURE="insure"
diff -ur globus_core-5.14.orig/config/acmp.m4 globus_core-5.14/config/acmp.m4
--- globus_core-5.14.orig/config/acmp.m4	2004-08-24 17:37:05.000000000 +0200
+++ globus_core-5.14/config/acmp.m4	2008-10-05 19:18:59.000000000 +0200
@@ -31,8 +31,7 @@
 AC_DEFUN([LAC_MP_INC_ARGS],
 [
 AC_ARG_WITH(mpi-includes,
-    [  --with-mpi-includes     Specify include flags for MPI
-                          (example --with-mpi-includes=-I/path/to/mpi/headers)],
+    AC_HELP_STRING([--with-mpi-includes], [Specify include flags for MPI (example --with-mpi-includes=-I/path/to/mpi/headers)]),
     [if test "$build_arg_mpi" != "yes" ; then
         AC_MSG_ERROR([you must specify --with-mpi[[=yes]] to use --with-mpi-includes])
         exit 1
@@ -46,8 +45,7 @@
     ])
 
 AC_ARG_WITH(mpi-libs,
-    [  --with-mpi-libs         Specify libs and LDFLAGS for MPI
-                          (example --with-mpi-libs=\"-L/path/to/mpi/libs -lmpi\")],
+    AC_HELP_STRING([--with-mpi-libs], [Specify libs and LDFLAGS for MPI (example --with-mpi-libs="-L/path/to/mpi/libs -lmpi")]),
     [if test "$build_arg_mpi" != "yes" ; then
         AC_MSG_ERROR([you must specify --with-mpi[[=yes]] to use --with-mpi-libs])
         exit 1
@@ -64,7 +62,7 @@
 AC_DEFUN([LAC_MP_ARGS],
 [
 AC_ARG_WITH(mpi,
-    [  --with-mpi              include the MPI protocols],
+    AC_HELP_STRING([--with-mpi], [include the MPI protocols]),
     [if test "$withval" = "yes" ; then
         build_arg_mpi='yes'
      else
diff -ur globus_core-5.14.orig/config/acthreads.m4 globus_core-5.14/config/acthreads.m4
--- globus_core-5.14.orig/config/acthreads.m4	2006-01-17 23:17:49.000000000 +0100
+++ globus_core-5.14/config/acthreads.m4	2008-10-05 18:26:04.000000000 +0200
@@ -21,11 +21,11 @@
 AC_BEFORE([$0], [LAC_THREADS])
 
 AC_ARG_WITH(thread-library,
-        [  --with-thread-library=PATH    path to thread library files],
+        AC_HELP_STRING([--with-thread-library=PATH], [path to thread library files]),
         [lac_thread_library_path="$withval"],
         [lac_thread_library_path=${lac_thread_library_path=''}])
 AC_ARG_WITH(thread-includes,
-        [  --with-thread-includes=PATH   path to thread include files],
+        AC_HELP_STRING([--with-thread-includes=PATH], [path to thread include files]),
         [lac_thread_include_path="$withval"],
         [lac_thread_include_path=${lac_thread_include_path=''}])
 ])
diff -ur globus_core-5.14.orig/configure.in globus_core-5.14/configure.in
--- globus_core-5.14.orig/configure.in	2005-07-28 21:38:23.000000000 +0200
+++ globus_core-5.14/configure.in	2008-10-05 22:08:33.000000000 +0200
@@ -36,7 +36,7 @@
 
 AC_ARG_WITH(
     flavor,
-    [  --with-flavor                 Globus flavor string],
+    AC_HELP_STRING([--with-flavor=FLAVOR], [Globus flavor string]),
     [globus_cv_flavor="$withval"],
     [globus_cv_flavor="notset"])
 
@@ -76,9 +76,9 @@
 fi
 
 
-AC_ARG_ENABLE(internal-doc,
-[  --enable-am-depends		Enable automake dependency caching.
-				(Requires gcc, developers only)],
+AC_ARG_ENABLE(am-depends,
+AC_HELP_STRING([--enable-am-depends],
+[Enable automake dependency caching. (Requires gcc, developers only)]),
 [
 	if test "X$GCC" = "Xyes"; then
 		AUTOMAKE_OPTS=""

globus-core-libtool.patch:

--- NEW FILE globus-core-libtool.patch ---
diff -ur globus-core-5.15.orig/configure.in globus-core-5.15/configure.in
--- globus-core-5.15.orig/configure.in	2008-12-16 05:40:04.373821611 +0000
+++ globus-core-5.15/configure.in	2008-12-16 05:38:25.741802000 +0000
@@ -179,7 +179,6 @@
 
 
 AM_PROG_LIBTOOL
-mv ./libtool libtool-$GLOBUS_FLAVOR_NAME
 
 dnl
 dnl Output selected thread package
@@ -222,3 +221,4 @@
 	pkgdata/build-parameters
 	)
 
+mv ./libtool libtool-$GLOBUS_FLAVOR_NAME

globus-core-usr.patch:

--- NEW FILE globus-core-usr.patch ---
diff -ur globus_core-5.15.orig/aclocal/acdoxygen.m4 globus_core-5.15/aclocal/acdoxygen.m4
--- globus_core-5.15.orig/aclocal/acdoxygen.m4	2004-08-24 17:37:02.000000000 +0200
+++ globus_core-5.15/aclocal/acdoxygen.m4	2008-10-21 09:59:47.000000000 +0200
@@ -39,7 +39,8 @@
         lac_tag="${lac_tag_base}.tag"
             lac_doxygen_tagfiles="$lac_doxygen_tagfiles $x"
             lac_doxygen_internal_tagfiles="$lac_doxygen_internal_tagfiles ${x}i"
-        lac_doxygen_installdox="$lac_doxygen_installdox -l${lac_tag}@../../${lac_tag_base}/html"
+            lac_html_dir=`echo ${x} | sed -e 's|.*/\(.*/html\)/.*|../../\1|'`
+            lac_doxygen_installdox="$lac_doxygen_installdox -l${lac_tag}@${lac_html_dir}"
     fi
     done
     AC_SUBST(lac_doxygen_tagfiles)
@@ -123,7 +124,7 @@
     LAC_DOXYGEN_PROJECT($GPT_NAME)
     LAC_DOXYGEN_OUTPUT_TAGFILE($GPT_NAME)
 
-    lac_dep_check="$GLOBUS_LOCATION/sbin/globus-build-doxygen-dependencies"
+    lac_dep_check="${GLOBUS_LOCATION:-/usr}/sbin/globus-build-doxygen-dependencies"
 
     if test ! -x $lac_dep_check ; then
 
diff -ur globus_core-5.15.orig/aclocal/globus_package.m4 globus_core-5.15/aclocal/globus_package.m4
--- globus_core-5.15.orig/aclocal/globus_package.m4	2008-10-21 09:54:55.000000000 +0200
+++ globus_core-5.15/aclocal/globus_package.m4	2008-10-21 09:57:03.000000000 +0200
@@ -2,15 +2,8 @@
 
 AM_MAINTAINER_MODE
 
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
 if test "x$GPT_LOCATION" = "x"; then
-    GPT_LOCATION=$GLOBUS_LOCATION
-    export GPT_LOCATION
+    GPT_LOCATION=/usr
 fi
 
 #extract whether the package is built with flavors from the src metadata
@@ -41,7 +34,8 @@
 	        echo "Warning: $withval ignored" >&2
         else
 		GLOBUS_FLAVOR_NAME=$withval
-                if test ! -f "$GLOBUS_LOCATION/etc/globus_core/flavor_$GLOBUS_FLAVOR_NAME.gpt"; then
+		if test ! -f "${GLOBUS_LOCATION:-/usr}/share/globus/flavors/flavor_$GLOBUS_FLAVOR_NAME.gpt" \
+		     -a ! -f "${GLOBUS_LOCATION:-/usr}/etc/globus_core/flavor_$GLOBUS_FLAVOR_NAME.gpt"; then
 	                echo "ERROR: Flavor $GLOBUS_FLAVOR_NAME has not been installed" >&2
 	                exit 1
                 fi 
@@ -70,10 +64,13 @@
 
 # get the environment scripts
 
-. $GLOBUS_LOCATION/libexec/globus-build-env-$GLOBUS_FLAVOR_NAME.sh
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-build-env-$GLOBUS_FLAVOR_NAME.sh ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-build-env-$GLOBUS_FLAVOR_NAME.sh
+else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-build-env-$GLOBUS_FLAVOR_NAME.sh
+fi
 
-prefix='$(GLOBUS_LOCATION)'
-exec_prefix='$(GLOBUS_LOCATION)'
+ac_default_prefix=${GLOBUS_LOCATION:-$ac_default_prefix}
 
 # doxygendir must have absolute path...
 saveprefix=$prefix
@@ -120,7 +117,7 @@
 
 
 define([AM_PROG_LIBTOOL],[
-	LIBTOOL='$(SHELL) $(GLOBUS_LOCATION)/sbin/libtool-$(GLOBUS_FLAVOR_NAME)'
+	LIBTOOL='$(SHELL) ${sbindir}/libtool-$(GLOBUS_FLAVOR_NAME)'
 	AC_SUBST(LIBTOOL)
 	AC_SUBST(LN_S)
 ])
Endast i globus_core-5.15/aclocal: globus_package.m4.orig
diff -ur globus_core-5.15.orig/bootstrap globus_core-5.15/bootstrap
--- globus_core-5.15.orig/bootstrap	2004-08-24 17:36:59.000000000 +0200
+++ globus_core-5.15/bootstrap	2008-10-21 09:57:03.000000000 +0200
@@ -1,12 +1,5 @@
 #! /bin/sh
 
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
-
 error()
 {
     echo ""
@@ -34,20 +27,23 @@
 fi
 
 # test to see if GPT macros are in a seperate location
-if test ! -f "$GLOBUS_LOCATION/share/globus_aclocal/gpt_autoconf_macros.m4"; then
-    if test "x$GPT_LOCATION" = "x"; then
-        echo "ERROR Globus Packaging Tools not found" >&2
-        echo "ERROR either set GPT_LOCATION or install them in $GLOBUS_LOCATION" >&2
-        exit 1
+if test ! -f "${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/gpt_autoconf_macros.m4" \
+     -a ! -f "${GLOBUS_LOCATION:-/usr}/share/globus_aclocal/gpt_autoconf_macros.m4"; then
+    if test -d "${GPT_LOCATION:-/usr}/share/globus/aclocal"; then
+        config="$config -I ${GPT_LOCATION:-/usr}/share/globus/aclocal"
     else
-        config="$config -I $GPT_LOCATION/share/globus_aclocal"
+        config="$config -I ${GPT_LOCATION:-/usr}/share/globus_aclocal"
     fi
 else
-    config="$config -I $GLOBUS_LOCATION/share/globus_aclocal"
+    if test -d "${GLOBUS_LOCATION:-/usr}/share/globus/aclocal"; then
+        config="$config -I ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal"
+    else
+        config="$config -I ${GLOBUS_LOCATION:-/usr}/share/globus_aclocal"
+    fi
 fi
 
 if test "x$GPT_LOCATION" = "x"; then
-    GPT_LOCATION=$GLOBUS_LOCATION
+    GPT_LOCATION=/usr
 fi
 
 echo "running aclocal $config"
diff -ur globus_core-5.15.orig/configure.in globus_core-5.15/configure.in
--- globus_core-5.15.orig/configure.in	2008-10-21 09:54:55.000000000 +0200
+++ globus_core-5.15/configure.in	2008-10-21 09:57:03.000000000 +0200
@@ -2,20 +2,11 @@
 AC_INIT(Makefile.am)
 AC_CONFIG_AUX_DIR(config)
 
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
-
 if test "x$GPT_LOCATION" = "x"; then
-    GPT_LOCATION=$GLOBUS_LOCATION
-    export GPT_LOCATION
+    GPT_LOCATION=/usr
 fi
 
-prefix='$(GLOBUS_LOCATION)'
-exec_prefix='$(GLOBUS_LOCATION)'
+ac_default_prefix=${GLOBUS_LOCATION:-$ac_default_prefix}
 
 # save CC and CFLAGS, so AC_PROG_CC can detect and use a compiler
 # up to the point where we want to pick a compiler based on the
diff -ur globus_core-5.15.orig/doxygen/globus-build-doxygen-dependencies globus_core-5.15/doxygen/globus-build-doxygen-dependencies
--- globus_core-5.15.orig/doxygen/globus-build-doxygen-dependencies	2006-01-19 06:54:28.000000000 +0100
+++ globus_core-5.15/doxygen/globus-build-doxygen-dependencies	2008-10-21 09:57:03.000000000 +0200
@@ -32,8 +32,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-
+  $gpath = "/usr";
 }
 
 if (!defined($gpath))
@@ -49,6 +48,12 @@
 use Cwd;
 
 my $prefix = $ENV{GLOBUS_LOCATION};
+
+if (!defined($prefix))
+{
+  $prefix = "/usr";
+}
+
 my $srcfile;
 my $help;
 my $debug = 0;
@@ -105,7 +110,8 @@
             {
                 print STDERR "Found dependency $name\n" if $debug;
                 $dependencies{$name} = 1;
-                $new_pkgfile =
+                $new_pkgfile = -f "$prefix/share/globus/packages/$name/pkg_data_noflavor_doc.gpt" ?
+                    "$prefix/share/globus/packages/$name/pkg_data_noflavor_doc.gpt" :
                     "$prefix/etc/globus_packages/$name/pkg_data_noflavor_doc.gpt";
                 foreach(process_package($new_pkgfile, $name))
                 {
diff -ur globus_core-5.15.orig/doxygen/globus-update-doxygen-index globus_core-5.15/doxygen/globus-update-doxygen-index
--- globus_core-5.15.orig/doxygen/globus-update-doxygen-index	2006-09-22 06:48:05.000000000 +0200
+++ globus_core-5.15/doxygen/globus-update-doxygen-index	2008-10-21 09:57:03.000000000 +0200
@@ -43,11 +43,14 @@
     $gpt_path = $ENV{GPT_LOCATION};
     if (!defined($gpt_path))
     {
-      $gpt_path = $ENV{GLOBUS_LOCATION};
-
+      $gpt_path = "/usr";
     }
 
     $globus_path = $ENV{GLOBUS_LOCATION};
+    if (!defined($globus_path))
+    {
+      $globus_path = "/usr";
+    }
 
     if (!defined($gpt_path) || !defined($globus_path))
     {
@@ -95,7 +98,7 @@
 print "Sorting into functional groups\n";
 foreach (keys %pkgs) {
     my $package_factory = new Grid::GPT::PackageFactory();
-    my @package_files = glob("$globus_path/etc/globus_packages/$_/pkg_data*.gpt");
+    my @package_files = glob("$globus_path/{share/globus/packages,etc/globus_packages}/$_/pkg_data*.gpt");
     my $package_file = $package_files[0];
 
     if ($package_file eq '') {
diff -ur globus_core-5.15.orig/scripts/globus-bootstrap.sh globus_core-5.15/scripts/globus-bootstrap.sh
--- globus_core-5.15.orig/scripts/globus-bootstrap.sh	2006-01-19 06:54:29.000000000 +0100
+++ globus_core-5.15/scripts/globus-bootstrap.sh	2008-10-21 09:57:03.000000000 +0200
@@ -27,7 +27,11 @@
             rm ${file}
         fi
         echo "installing ${file} link"
-        ln -s $GLOBUS_LOCATION/share/globus_aclocal/${file} ${file}
+        if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/${file} ; then
+            ln -s ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/${file} ${file}
+        else
+            ln -s ${GLOBUS_LOCATION:-/usr}/share/globus_aclocal/${file} ${file}
+        fi
     fi
 done
 
@@ -38,23 +42,36 @@
     do
 	if test ! -h "doxygen/$file" ; then
 	    echo "installing doxygen/$file link"
-	    ln -s $GLOBUS_LOCATION/share/globus_aclocal/$file doxygen/$file
+	    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/$file ; then
+		ln -s ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/$file doxygen/$file
+	    else
+		ln -s ${GLOBUS_LOCATION:-/usr}/share/globus_aclocal/$file doxygen/$file
+	    fi
 	fi
     done
     
     if test ! -h doxygen/Makefile.am ; then
 	echo "installing Makefile.am link in doxygen"
-	ln -s $GLOBUS_LOCATION/share/globus_aclocal/doxygen_Makefile.am \
-	    doxygen/Makefile.am
+	if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/doxygen_Makefile.am ; then
+	    ln -s ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/doxygen_Makefile.am \
+		doxygen/Makefile.am
+	else
+	    ln -s ${GLOBUS_LOCATION:-/usr}/share/globus_aclocal/doxygen_Makefile.am \
+		doxygen/Makefile.am
+	fi
     fi
 fi
 
 
 if test "x$GPT_LOCATION" = "x"; then
-    GPT_LOCATION=$GLOBUS_LOCATION
+    GPT_LOCATION=/usr
 fi
 
-. ${GPT_LOCATION}/libexec/gpt-bootstrap.sh
+if test -f ${GPT_LOCATION}/share/globus/gpt-bootstrap.sh ; then
+    . ${GPT_LOCATION}/share/globus/gpt-bootstrap.sh
+else
+    . ${GPT_LOCATION}/libexec/gpt-bootstrap.sh
+fi
 
 # update stamp.h.in
 


--- NEW FILE globus-core.spec ---
Name:		globus-core
%global _name %(tr - _ <<< %{name})
Version:	5.15
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 directory
#		source-trees/core/source in
#		http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/
#		gt4.2.1-all-source-installer.tar.bz2
Source:		%{_name}-%{version}.tar.gz
Source1:	globus-gpt2pkg-config
#		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 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
#		Adapt dependency script to Fedora's documentation location:
#		Not relevant for upstream - not submitted to globus bugzilla
Patch10:	%{name}-fedora.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:	%{name}-devel = %{version}-%{release}
Obsoletes:	%{name}-devel < 5.15-0.5
Requires:	pkgconfig
BuildRequires:	grid-packaging-tools
BuildRequires:	perl(XML::DOM)

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%global enable64 yes
%else
%global flavor gcc32pthr
%global enable64 no
%endif

%global debug_package %{nil}

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

%description
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name} package contains:
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 .fedora

# custom perl requires that removes dependency on gpt perl modules
cat << EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Grid::GPT::.*)/d'
EOF
%global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

%build
rm -rf autom4te.cache
./bootstrap

%configure --includedir='${prefix}/include/globus' \
	   --libexecdir='${datadir}/globus' \
	   --with-threads=pthreads --with-thread-library=%{_libdir} \
	   --with-flavor=%{flavor} \
	   --enable-64bit=%{enable64} \
	   --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

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh

install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config

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

rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
grep -v GLOBUS_LICENSE \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist

# Generate package filelists

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/aclocal
%dir %{_datadir}/globus/doxygen
%dir %{_datadir}/globus/flavors
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_libdir}/globus
%dir %{_libdir}/globus/include
%{_libdir}/pkgconfig/%{name}.pc
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%{_datadir}/globus/globus-gpt2pkg-config

%changelog
* Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
- Change defines to globals

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-0.5
- Merge devel with main

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-0.4
- Add s390x to the list of 64 bit platforms

* Mon Dec 29 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-0.3
- Adapt to updated GPT package

* Sun Oct 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.14-0.1
- Autogenerated


--- NEW FILE globus-gpt2pkg-config ---
#!/usr/bin/perl

use XML::DOM;

my $parser = new XML::DOM::Parser;

die "No gpt package file provided" if not defined @ARGV[0];

my $gptdoc = $parser->parsefile(@ARGV[0]);

my $gptmeta = $gptdoc->getElementsByTagName("gpt_package_metadata");
my $gptname = $gptmeta->item(0)->getAttributeNode("Name")->getValue;

my $gptagingver = $gptdoc->getElementsByTagName("Aging_Version");
my $gptmajorver = $gptagingver->item(0)->getAttributeNode("Major")->getValue;
my $gptminorver = $gptagingver->item(0)->getAttributeNode("Minor")->getValue;

my $description = $gptdoc->getElementsByTagName("Description")
    ->item(0)->getFirstChild->getData;

my $flavor = $gptdoc->getElementsByTagName("Flavor")
    ->item(0)->getFirstChild->getData;

my %deps;
for my $bindep ($gptdoc->getElementsByTagName("Binary_Dependencies")) {
    my $type = $bindep->getAttributeNode("Type")->getValue;
    next unless $type eq "Compile";
    for my $dep ($bindep->getElementsByTagName("Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$deps{$depname} = $depver;
    }
}

my $cflagselem = $gptdoc->getElementsByTagName("cflags")->item(0);
my $cflagsnode = $cflagselem->getFirstChild if defined $cflagselem;
my $cflags = $cflagsnode->getData if defined $cflagsnode;

my $extincelem = $gptdoc->getElementsByTagName("external_includes")->item(0);
my $extincnode = $extincelem->getFirstChild if defined $extincelem;
my $extinc = $extincnode->getData if defined $extincnode;

my $pkglibselem = $gptdoc->getElementsByTagName("pkg_libs")->item(0);
my $pkglibsnode = $pkglibselem->getFirstChild if defined $pkglibselem;
my $pkglibs = $pkglibsnode->getData if defined $pkglibsnode;

my $extlibselem = $gptdoc->getElementsByTagName("external_libs")->item(0);
my $extlibsnode = $extlibselem->getFirstChild if defined $extlibselem;
my $extlibs = $extlibsnode->getData if defined $extlibsnode;

my $name = $gptname;
$name =~ tr/_/-/;

$description =~ s!^\s+|\s+$!!g;
$description =~ s!\s+! !g;

my $version = $gptmajorver . '.' . $gptminorver;

my $libs = "-L\${libdir} $pkglibs $extlibs";
$libs =~ s!^\s+|\s+$!!g;
$libs =~ s!\s+! !g;

$cflags = "$cflags -I\${includedir}/globus -I\${libdir}/globus/include $extinc";
$cflags =~ s!^\s+|\s+$!!g;
$cflags =~ s!\s+! !g;

print "prefix=/usr\n";
print "exec_prefix=\${prefix}\n";
print "libdir=\${exec_prefix}/lib\n" if $flavor =~ /32/;
print "libdir=\${exec_prefix}/lib64\n" if $flavor =~ /64/;
print "includedir=\${prefix}/include\n";
print "\n";
print "Name: $name\n";
print "Description: Globus Toolkit - $description\n";
print "Version: $version\n";
print "Requires:";
while (($key, $value) = each(%deps)) {
    print ($value > 0 ? " $key >= $value" : " $key");
}
print "\n";
print "Libs: $libs\n";
print "Cflags: $cflags\n";


--- NEW FILE import.log ---
globus-core-5_15-1_fc9:HEAD:globus-core-5.15-1.fc9.src.rpm:1237533693


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Mar 2009 03:10:11 -0000	1.1
+++ .cvsignore	20 Mar 2009 07:23:24 -0000	1.2
@@ -0,0 +1 @@
+globus_core-5.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Mar 2009 03:10:11 -0000	1.1
+++ sources	20 Mar 2009 07:23:25 -0000	1.2
@@ -0,0 +1 @@
+926e3cc1a6eef6e7fc9727aae73e3930  globus_core-5.15.tar.gz


