rpms/globus-common/F-10 globus-common-bad-age.patch, NONE, 1.1 globus-common-deps.patch, NONE, 1.1 globus-common-doxygen.patch, NONE, 1.1 globus-common-extradist.patch, NONE, 1.1 globus-common-ltdlmutex.patch, NONE, 1.1 globus-common-no-pthread-exceptions.patch, NONE, 1.1 globus-common-noflavext.patch, NONE, 1.1 globus-common-nosuchfile.patch, NONE, 1.1 globus-common-setup.patch, NONE, 1.1 globus-common-typo.patch, NONE, 1.1 globus-common-usr.patch, NONE, 1.1 globus-common.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mattias Ellert
ellert at fedoraproject.org
Tue Apr 7 08:31:54 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16359/F-10
Modified Files:
.cvsignore sources
Added Files:
globus-common-bad-age.patch globus-common-deps.patch
globus-common-doxygen.patch globus-common-extradist.patch
globus-common-ltdlmutex.patch
globus-common-no-pthread-exceptions.patch
globus-common-noflavext.patch globus-common-nosuchfile.patch
globus-common-setup.patch globus-common-typo.patch
globus-common-usr.patch globus-common.spec import.log
Log Message:
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals
globus-common-bad-age.patch:
--- NEW FILE globus-common-bad-age.patch ---
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 @@
<gpt_package_metadata Name="globus_common" Format_Version="0.02">
- <Aging_Version Major="10" Minor="2" Age="11"/>
+ <Aging_Version Major="10" Minor="2" Age="10"/>
<Description >Common Library</Description>
<Functional_Group >Common</Functional_Group>
<Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
globus-common-deps.patch:
--- NEW FILE globus-common-deps.patch ---
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-06-25 00:11:11.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in 2008-07-14 11:57:49.000000000 +0200
@@ -51,14 +51,6 @@
<pkg_libs>-lglobus_common</pkg_libs>
</Build_Environment>
- <Source_Setup_Dependency PkgType="rtl">
- <Setup_Dependency Name="globus_common_setup">
- <Version>
- <Simple_Version Major="2"/>
- </Version>
- </Setup_Dependency>
- </Source_Setup_Dependency>
-
<Source_Setup_Dependency PkgType="pgm">
<Setup_Dependency Name="globus_common_setup">
<Version>
globus-common-doxygen.patch:
--- NEW FILE globus-common-doxygen.patch ---
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
@@ -19,10 +19,10 @@
/**
* @file globus_callback.h Globus Callback API
*
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $<br />
- * $Date: 2006/01/19 05:54:13 $<br />
- * $Revision: 1.12 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $
+ * $Date: 2006/01/19 05:54:13 $
+ * $Revision: 1.12 $
+ * $Author: mlink $
*/
/**
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
@@ -44,14 +44,6 @@
EXTERN_C_BEGIN
-/* TODO remove this if we ever doxyegenate common fully */
-/**
- * @mainpage
- *
- * @note <b>More globus_common API documentation is available <a href="../../../common/">here</a>.</b>
- *
- */
-
/******************************************************************************
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
@@ -17,10 +17,10 @@
/**
* @file globus_thread_common.h Common Thread Interface
*
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $<br />
- * $Date: 2006/01/19 05:54:14 $<br />
- * $Revision: 1.6 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $
+ * $Date: 2006/01/19 05:54:14 $
+ * $Revision: 1.6 $
+ * $Author: mlink $
*/
/******************************************************************************
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
@@ -67,7 +67,7 @@
GLOBUS_URL_SCHEME_X_NEXUS,
/** GASS Cache Entry */
GLOBUS_URL_SCHEME_X_GASS_CACHE,
- /** Any other URL of the form <scheme>://<something */
+ /** Any other URL of the form <scheme>://<something> */
GLOBUS_URL_SCHEME_UNKNOWN,
GLOBUS_URL_SCHEME_SSHFTP,
/** Total number of URL schemes supported */
globus-common-extradist.patch:
--- NEW FILE globus-common-extradist.patch ---
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
@@ -5,8 +5,6 @@
sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
-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_is_local_user_LDADD = ../library/libglobus_common_$(GLOBUS_FLAVOR_NAME).la @GPT_PGM_LINKS@
endif
+EXTRA_DIST = globus-sh-exec.in globus-version.in
+
include $(top_srcdir)/globus_automake_post
globus-common-ltdlmutex.patch:
--- NEW FILE globus-common-ltdlmutex.patch ---
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
@@ -24,6 +24,11 @@
GPT_SET_LIBS(["$EXTERNAL_LIBS"])
+save_LIBS=$LIBS
+LIBS="$LIBS $GPT_LIBS"
+AC_CHECK_FUNCS([lt_dlmutex_register])
+LIBS=$save_LIBS
+
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
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include "config.h"
#include "globus_extension.h"
#include "globus_debug.h"
#include GLOBUS_THREAD_INCLUDE
@@ -169,6 +170,7 @@
{
goto error_dlinit;
}
+# ifdef HAVE_LT_DLMUTEX_REGISTER
if(lt_dlmutex_register(
globus_l_libtool_mutex_lock,
globus_l_libtool_mutex_unlock,
@@ -177,6 +179,7 @@
{
goto error_dlmutex;
}
+# endif /* HAVE_LT_DLMUTEX_REGISTER */
# endif /* !BUILD_STATIC_ONLY */
globus_hashtable_init(
globus-common-no-pthread-exceptions.patch:
--- NEW FILE globus-common-no-pthread-exceptions.patch ---
diff -ur globus-common-7.30.orig/library/globus_thread_pthreads.h globus-common-7.30/library/globus_thread_pthreads.h
--- globus-common-7.30.orig/library/globus_thread_pthreads.h 2005-04-19 00:59:37.000000000 +0200
+++ globus-common-7.30/library/globus_thread_pthreads.h 2008-06-30 18:22:33.000000000 +0200
@@ -57,7 +57,13 @@
#include <pthread.h>
EXTERN_C_END
#else /* TARGET_ARCH_AIX */
+#if defined __GNUC__ && defined __EXCEPTIONS
+#undef __EXCEPTIONS
#include <pthread.h>
+#define __EXCEPTIONS
+#else
+#include <pthread.h>
+#endif
#endif /* TARGET_ARCH_AIX */
EXTERN_C_BEGIN
globus-common-noflavext.patch:
--- NEW FILE globus-common-noflavext.patch ---
diff -ur globus-common-7.30.orig/library/globus_extension.c globus-common-7.30/library/globus_extension.c
--- globus-common-7.30.orig/library/globus_extension.c 2005-04-19 00:59:29.000000000 +0200
+++ globus-common-7.30/library/globus_extension.c 2008-07-05 09:22:39.000000000 +0200
@@ -357,11 +357,24 @@
dlhandle = lt_dlopenext(library);
if(!dlhandle)
{
+ snprintf(library, 1024, "lib%s", name);
+ library[1023] = 0;
+ dlhandle = lt_dlopenext(library);
+ }
+ if(!dlhandle)
+ {
/* older libtools dont search the extensions correctly */
snprintf(library, 1024, "lib%s_%s" MY_LIB_EXT, name, build_flavor);
library[1023] = 0;
dlhandle = lt_dlopenext(library);
}
+ if(!dlhandle)
+ {
+ /* older libtools dont search the extensions correctly */
+ snprintf(library, 1024, "lib%s" MY_LIB_EXT, name);
+ library[1023] = 0;
+ dlhandle = lt_dlopenext(library);
+ }
if(!dlhandle)
{
globus-common-nosuchfile.patch:
--- NEW FILE globus-common-nosuchfile.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am 2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am 2008-10-11 12:11:57.000000000 +0200
@@ -157,7 +157,6 @@
globus_thread_sproc.c \
globus_thread_sproc.h
-EXTRA_HEADERS = \
- globus_netos_dir.h
+EXTRA_HEADERS =
include $(top_srcdir)/globus_automake_post
globus-common-setup.patch:
--- NEW FILE globus-common-setup.patch ---
diff -ur globus_common_setup-2.6.orig/configure.in globus_common_setup-2.6/configure.in
--- globus_common_setup-2.6.orig/configure.in 2002-01-10 03:26:32.000000000 +0100
+++ globus_common_setup-2.6/configure.in 2008-10-13 00:09:15.000000000 +0200
@@ -9,10 +9,31 @@
dnl Initialize the automake rules the last argument
AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
+AC_ARG_WITH(tmpdir,
+ AC_HELP_STRING([--with-tmpdir=DIR],
+ [directory for temporary files [[/tmp]]]),
+ [tmpdir="$withval"],
+ [tmpdir=/tmp])
+AC_SUBST(tmpdir)
+AC_ARG_WITH(local-tmpdir,
+ AC_HELP_STRING([--with-local-tmpdir=DIR],
+ [local directory for temporary files [[TMPDIR]]]),
+ [local_tmpdir="$withval"],
+ [local_tmpdir='${tmpdir}'])
+AC_SUBST(local_tmpdir)
+
+AC_ARG_WITH(secure-tmpdir,
+ AC_HELP_STRING([--with-secure-tmpdir=DIR],
+ [secure directory for temporary files [[PREFIX/tmp]]]),
+ [secure_tmpdir="$withval"],
+ [secure_tmpdir='${prefix}/tmp'])
+AC_SUBST(secure_tmpdir)
AC_OUTPUT(
Makefile
+ globus-script-initializer
+ Paths.pm:Paths.in
pkgdata/Makefile
pkgdata/pkg_data_src.gpt
)
diff -ur globus_common_setup-2.6.orig/findshelltools.in globus_common_setup-2.6/findshelltools.in
--- globus_common_setup-2.6.orig/findshelltools.in 2004-09-29 14:52:55.000000000 +0200
+++ globus_common_setup-2.6/findshelltools.in 2008-10-13 00:09:15.000000000 +0200
@@ -1,16 +1,6 @@
AC_REVISION($Revision: 1.2 $)
AC_INIT(globus-sh-tools-vars.sh.in)
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
- echo "ERROR Please specify GLOBUS_LOCATION" >&2
- exit 1
-fi
-
-prefix='$(GLOBUS_LOCATION)'
-exec_prefix='$(GLOBUS_LOCATION)'
-
if test "x$PERL" = "x"; then
AC_PATH_PROG(PERL,perl)
fi
diff -ur globus_common_setup-2.6.orig/globus-script-initializer.in globus_common_setup-2.6/globus-script-initializer.in
--- globus_common_setup-2.6.orig/globus-script-initializer.in 2005-11-29 21:08:58.000000000 +0100
+++ globus_common_setup-2.6/globus-script-initializer.in 2008-10-13 00:09:15.000000000 +0200
@@ -1,49 +1,53 @@
-
-
-exec_prefix=${GLOBUS_LOCATION}
-prefix=$GLOBUS_LOCATION
-sbindir=${exec_prefix}/sbin
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-libexecdir=${exec_prefix}/libexec
-includedir=${exec_prefix}/include
-datadir=${prefix}/share
-sysconfdir=${prefix}/etc
-sharedstatedir=${prefix}/com
-localstatedir=${prefix}/var
+prefix=${GLOBUS_LOCATION:-/usr}
+exec_prefix=${GLOBUS_LOCATION:-/usr}
+bindir=@bindir@
+sbindir=@sbindir@
+libdir=@libdir@
+includedir=@includedir@
+flavorincludedir=@flavorincludedir@
+datadir=@datadir@
+libexecdir=@libexecdir@
+sysconfdir=@sysconfdir@
+sharedstatedir=@sharedstatedir@
+localstatedir=@localstatedir@
+setupdir=@setupdir@
+testdir=@testdir@
+perlmoduledir=@perlmoduledir@
tmpdir=@tmpdir@
local_tmpdir=@local_tmpdir@
secure_tmpdir=@secure_tmpdir@
+if [ x$prefix != "x/usr" ]; then
+
DELIM=
if [ -n "${LD_LIBRARY_PATH}" ]; then
DELIM=:
fi
-LD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH="${libdir}${DELIM}${LD_LIBRARY_PATH}"
DELIM=
if [ -n "${DYLD_LIBRARY_PATH}" ]; then
DELIM=:
fi
-DYLD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${DYLD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${libdir}${DELIM}${DYLD_LIBRARY_PATH}"
if [ -z "${LIBPATH}" ]; then
LIBPATH="/usr/lib:/lib"
fi
-LIBPATH="${GLOBUS_LOCATION}/lib:${LIBPATH}"
+LIBPATH="${libdir}:${LIBPATH}"
DELIM=
if [ -n "${SHLIB_PATH}" ]; then
DELIM=:
fi
-SHLIB_PATH="${GLOBUS_LOCATION}/lib${DELIM}${SHLIB_PATH}"
+SHLIB_PATH="${libdir}${DELIM}${SHLIB_PATH}"
-if [ -d $GLOBUS_LOCATION/lib/sasl ]; then
+if [ -d ${libdir}/sasl ]; then
DELIM=
if [ -n "${SASL_PATH}" ]; then
DELIM=:
fi
- SASL_PATH="${GLOBUS_LOCATION}/lib/sasl${DELIM}${SASL_PATH}"
+ SASL_PATH="${libdir}/sasl${DELIM}${SASL_PATH}"
fi
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBPATH SHLIB_PATH SASL_PATH
@@ -53,7 +57,7 @@
if [ "X${LD_LIBRARYN32_PATH}" != "X" ]; then
DELIM=:
fi
- LD_LIBRARYN32_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARYN32_PATH}"
+ LD_LIBRARYN32_PATH="${libdir}${DELIM}${LD_LIBRARYN32_PATH}"
export LD_LIBRARYN32_PATH
fi
@@ -62,10 +66,19 @@
if [ "X${LD_LIBRARY64_PATH}" != "X" ]; then
DELIM=:
fi
- LD_LIBRARY64_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY64_PATH}"
+ LD_LIBRARY64_PATH="${libdir}${DELIM}${LD_LIBRARY64_PATH}"
export LD_LIBRARY64_PATH
fi
+DELIM=
+if [ -n "${PERLLIB}" ]; then
+ DELIM=:
+fi
+PERLLIB="${perlmoduledir}${DELIM}${PERLLIB}"
+export PERLLIB
+
+fi
+
globus_source () {
# Check if file exists and source it
diff -ur globus_common_setup-2.6.orig/Makefile.am globus_common_setup-2.6/Makefile.am
--- globus_common_setup-2.6.orig/Makefile.am 2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Makefile.am 2008-10-13 00:09:15.000000000 +0200
@@ -3,25 +3,26 @@
setup_SCRIPTS = \
findshelltools \
- setup-tmpdirs \
setup-globus-common \
setup-globus-common.pl
setup_DATA = \
- globus-script-initializer.in \
- globus-sh-tools-vars.sh.in \
- Paths.in
+ globus-sh-tools-vars.sh.in
+
+libexec_SCRIPTS = globus-script-initializer
+
+globusperldir = $(perlmoduledir)/Globus/Core
+globusperl_DATA = Paths.pm
+
+findshelltools: findshelltools.in
+ autoconf -o findshelltools findshelltools.in
SUBDIRS = pkgdata
EXTRA_DIST = \
findshelltools \
findshelltools.in \
- setup-tmpdirs \
- setup-tmpdirs.in \
- globus-script-initializer.in \
- globus-sh-tools-vars.sh.in \
- Paths.in \
+ globus-sh-tools-vars.sh.in \
setup-globus-common \
setup-globus-common.pl
diff -ur globus_common_setup-2.6.orig/Paths.in globus_common_setup-2.6/Paths.in
--- globus_common_setup-2.6.orig/Paths.in 2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Paths.in 2008-10-13 00:09:15.000000000 +0200
@@ -4,26 +4,38 @@
@ISA = qw(Exporter);
- at EXPORT = qw($exec_prefix $prefix
- $sbindir $bindir
- $libdir $libexecdir $includedir
- $datadir $sysconfdir $sharedstatedir
+ at EXPORT = qw($prefix $exec_prefix
+ $bindir $sbindir $libdir
+ $includedir $flavorincludedir
+ $datadir $libexecdir
+ $sysconfdir $sharedstatedir
$localstatedir
+ $setupdir $testdir
+ $perlmoduledir
$tmpdir
$local_tmpdir
$secure_tmpdir);
-$exec_prefix=$ENV{GLOBUS_LOCATION};
+my $PACKAGE = "\$PACKAGE";
+my $GLOBUS_FLAVOR_NAME = "\$GLOBUS_FLAVOR_NAME";
+
$prefix=$ENV{GLOBUS_LOCATION};
-$sbindir="${exec_prefix}/sbin";
-$bindir="${exec_prefix}/bin";
-$libdir="${exec_prefix}/lib";
-$libexecdir="${exec_prefix}/libexec";
-$includedir="${exec_prefix}/include";
-$datadir="${prefix}/share";
-$sysconfdir="${prefix}/etc";
-$sharedstatedir="${prefix}/com";
-$localstatedir="${prefix}/var";
+$prefix="/usr" if (!defined $prefix);
+$exec_prefix=$ENV{GLOBUS_LOCATION};
+$exec_prefix="/usr" if (!defined $exec_prefix);
+$bindir="@bindir@";
+$sbindir="@sbindir@";
+$libdir="@libdir@";
+$includedir="@includedir@";
+$flavorincludedir="@flavorincludedir@";
+$datadir="@datadir@";
+$libexecdir="@libexecdir@";
+$sysconfdir="@sysconfdir@";
+$sharedstatedir="@sharedstatedir@";
+$localstatedir="@localstatedir@";
+$setupdir="@setupdir@";
+$testdir="@testdir@";
+$perlmoduledir="@perlmoduledir@";
$tmpdir="@tmpdir@";
$local_tmpdir="@local_tmpdir@";
$secure_tmpdir="@secure_tmpdir@";
diff -ur globus_common_setup-2.6.orig/setup-globus-common globus_common_setup-2.6/setup-globus-common
--- globus_common_setup-2.6.orig/setup-globus-common 2001-06-21 00:24:26.000000000 +0200
+++ globus_common_setup-2.6/setup-globus-common 2008-10-13 00:09:15.000000000 +0200
@@ -1,3 +1,8 @@
#! /bin/sh
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-common.pl
+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then
+ . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+ . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
+perl ${setupdir}/setup-globus-common.pl
diff -ur globus_common_setup-2.6.orig/setup-globus-common.pl globus_common_setup-2.6/setup-globus-common.pl
--- globus_common_setup-2.6.orig/setup-globus-common.pl 2006-01-19 06:54:11.000000000 +0100
+++ globus_common_setup-2.6/setup-globus-common.pl 2008-10-13 00:09:15.000000000 +0200
@@ -19,13 +19,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
-}
-
-if (!defined($gpath))
-{
- die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+ $gpath = "/usr";
}
@INC = (@INC, "$gpath/lib/perl");
@@ -34,37 +28,25 @@
my $metadata = new Grid::GPT::Setup(package_name => "globus_common_setup");
-my $globusdir = $ENV{GLOBUS_LOCATION};
-
-if((!defined($globusdir)))
-{
- die "GLOBUS_LOCATION needs to be set before running this script"
-}
-
-my $setupdir = "$globusdir/setup/globus/";
+require Globus::Core::Paths;
+my $setupdir = $Globus::Core::Paths::setupdir;
+my $libexecdir = $Globus::Core::Paths::libexecdir;
+my $bindir = $Globus::Core::Paths::bindir;
print "creating globus-sh-tools-vars.sh\n";
my $result = `$setupdir/findshelltools`;
-print "creating globus-script-initializer\n";
-print "creating Globus::Core::Paths\n";
-
-$result = `$setupdir/setup-tmpdirs`;
-
-for my $setupfile ('globus-script-initializer', 'globus-sh-tools-vars.sh')
+for my $setupfile ('globus-sh-tools-vars.sh')
{
- $result = system("cp $setupdir/$setupfile $globusdir/libexec");
- $result = system("chmod 0755 $globusdir/libexec/$setupfile");
-
+ $result = system("cp $setupdir/$setupfile $libexecdir/$setupfile");
+ $result = system("chmod 0644 $libexecdir/$setupfile");
}
-system("mkdir -p $globusdir/lib/perl/Globus/Core");
-system("cp $setupdir/Paths.pm $globusdir/lib/perl/Globus/Core/");
-system("chmod 0644 $globusdir/lib/perl/Globus/Core/Paths.pm");
+system("rm -f config.log config.status");
print "checking globus-hostname\n";
-my $hostname = `$globusdir/bin/globus-hostname`;
+my $hostname = `$bindir/globus-hostname`;
$hostname =~ s/\w//g; #strip whitespace
globus-common-typo.patch:
--- NEW FILE globus-common-typo.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am 2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am 2008-07-14 17:33:08.000000000 +0200
@@ -143,7 +143,7 @@
libglobus_common___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@
libglobus_common___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
-libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAS = @GPT_LDFLAGS@
+libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@
EXTRA_DIST = \
globus_callback_nothreads.c \
globus-common-usr.patch:
--- NEW FILE globus-common-usr.patch ---
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 2008-10-13 00:01:24.000000000 +0200
@@ -9,7 +9,7 @@
config \
doxygen
-sbin_SCRIPTS= \
+libexec_SCRIPTS= \
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 2008-10-13 00:01:24.000000000 +0200
@@ -17,7 +17,11 @@
#
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
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 2008-10-13 00:01:24.000000000 +0200
@@ -43,7 +43,11 @@
usage()
{
- . ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+ if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+ . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+ else
+ . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+ fi
globus_source ${libexecdir}/globus-sh-tools.sh
${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
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 2005-12-07 10:37:44.000000000 +0100
+++ globus_common-10.2/programs/Makefile.am 2008-10-13 00:01:24.000000000 +0200
@@ -3,7 +3,7 @@
if ENABLE_PROGRAMS
bin_SCRIPTS = globus-sh-exec globus-version
-libexec_PROGRAMS = globus-libc-hostname globus-is-local-user
+sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
EXTRA_DIST = globus-sh-exec.in globus-version.in
diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
--- globus_common-10.2.orig/scripts/globus-hostname 2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-hostname 2008-10-13 00:01:24.000000000 +0200
@@ -23,13 +23,12 @@
# domainname
-if test "x$GLOBUS_LOCATION" = "x"; then
- echo "ERROR Please specify GLOBUS_LOCATION" >&2
- exit 1
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
fi
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
-
PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} -e 's|.*/||g'`
PROGRAM_VERSION=`echo '$Revision: 1.3 $' | ${GLOBUS_SH_CUT-cut} -d' ' -f2`
@@ -67,7 +66,7 @@
EOF
}
-. ${GLOBUS_LOCATION}/libexec/globus-args-parser-header
+. ${libexecdir}/globus-args-parser-header
if [ -n "$1" ]; then
globus_args_unrecognized_option "$1"
@@ -79,8 +78,8 @@
if [ -z "${GLOBUS_HOSTNAME}" ] ; then
# Set the _fullname based upon Globus's hostname command
- if [ -x "${libexecdir}/globus-libc-hostname" ]; then
- _fullname="`${libexecdir}/globus-libc-hostname`"
+ if [ -x "${sbindir}/globus-libc-hostname" ]; then
+ _fullname="`${sbindir}/globus-libc-hostname`"
fi
# if failed to set, use the system's hostname command
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
--- globus_common-10.2.orig/scripts/globus-makefile-header 2008-02-20 17:03:35.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header 2008-10-13 00:01:24.000000000 +0200
@@ -25,29 +25,15 @@
my $gpt_path = $ENV{GPT_LOCATION};
my $globus_path = $ENV{GLOBUS_LOCATION};
-my $gpath;
-if ( !defined($gpt_path) && !defined($globus_path) )
+if ( !defined($gpt_path) )
{
- die("ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
+ $gpt_path = "/usr";
}
-if ( defined($gpt_path) )
+if ( !defined($globus_path) )
{
- $gpath = $gpt_path;
- if ( ! -d $gpath )
- {
- die("ERROR: $gpath doesn't exist!\n");
- }
-}
-
-if ( !defined($gpath) && defined($globus_path) )
-{
- $gpath = $globus_path;
- if ( ! -d $gpath )
- {
- die("ERROR: $gpath doesn't exist!\n");
- }
+ $globus_path = "/usr";
}
@@ -60,7 +46,7 @@
#
my($environment);
- at INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
+ at INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC);
if ( defined eval "require Grid::GPT::V1::Package" )
{
@@ -240,7 +226,9 @@
# point our installation object at our globus location
#
- $installation = new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
+ $installation = -d "$globus_path/share/globus/packages" ?
+ new Grid::GPT::Installation(pkgdir => "$globus_path/share/globus/packages") :
+ new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
$installation->set_depenv('Build');
#
@@ -313,10 +301,17 @@
# push all of our entries onto our header array
#
+ @INC = ("$globus_path/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(@$header, "GLOBUS_CFLAGS=\"$cflagslist\"");
- push(@$header, "GLOBUS_INCLUDES=\"-I${globus_path}/include/$flavor $includeslist\"");
+ push(@$header, "GLOBUS_INCLUDES=\"-I${includedir} -I${flavorincludedir} $includeslist\"");
push(@$header, "GLOBUS_LIBS=\"$libslist\"");
- push(@$header, "GLOBUS_LDFLAGS=\"-L${globus_path}/lib\"");
+ push(@$header, "GLOBUS_LDFLAGS=\"-L${libdir}\"");
push(@$header, "GLOBUS_PKG_LIBS=\"$pkglibslist $extlibslist\"");
push(@$header, "GLOBUS_LIBTOOL=\"$globus_path/sbin/libtool-$flavor\"");
}
@@ -332,7 +327,9 @@
my($header) = @_;
my($copy);
- open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-build-env-$flavor.sh!\n$common_error\n";
+ open(IN, "$globus_path/share/globus/globus-build-env-$flavor.sh") ||
+ open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") ||
+ die "ERROR: Cannot open globus-build-env-$flavor.sh!\n$common_error\n";
while (<IN>)
{
@@ -370,7 +367,9 @@
my($header) = @_;
my($copy);
- open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-sh-tools-vars.sh!\n$common_error\n";
+ open(IN, "$globus_path/share/globus/globus-sh-tools-vars.sh") ||
+ open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") ||
+ die "ERROR: Cannot open globus-sh-tools-vars.sh!\n$common_error\n";
while (<IN>)
{
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 2008-10-13 00:01:24.000000000 +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);
+ at 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(<IN>)
{
@@ -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(<IN>)
{
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 2008-10-13 00:01:24.000000000 +0200
@@ -18,7 +18,11 @@
if test -z "$GLOBUS_SH_VARIABLES_SET" ; then
- . ${GLOBUS_LOCATION}/libexec/globus-sh-tools-vars.sh
+ if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh ; then
+ . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh
+ else
+ . ${GLOBUS_LOCATION:-/usr}/libexec/globus-sh-tools-vars.sh
+ fi
# export all commands:
--- NEW FILE globus-common.spec ---
Name: globus-common
%global _name %(tr - _ <<< %{name})
Version: 10.2
%global setupversion 2.6
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
# tar -zcf globus_common-10.2.tar.gz globus_common-10.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
# tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
Source1: %{_name}_setup-%{setupversion}.tar.gz
Source8: epstopdf-2.9.5gw
Source9: GLOBUS_LICENSE
# Environment variable elimination patch:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
Patch0: %{name}-usr.patch
# Segfault fix patch:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6460
Patch1: %{name}-no-pthread-exceptions.patch
# Allow plugins without the flavor extension in the name:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6461
Patch2: %{name}-noflavext.patch
# Remove bogus inter-package dependency:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6462
Patch3: %{name}-deps.patch
# Fixes a stupid typo in library/Makefile.am:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6463
Patch4: %{name}-typo.patch
# The file globus_netos_dir.h does not exist:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6464
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
# Check for function removed from newer versions of libltdl:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6578
Patch9: %{name}-ltdlmutex.patch
# Configure options not propagated in globus common setup:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6467
Patch10: %{name}-setup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-libtool >= 1
BuildRequires: grid-packaging-tools
BuildRequires: globus-libtool-devel >= 1
BuildRequires: globus-core >= 4
BuildRequires: doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires: graphviz
BuildRequires: ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires: graphviz
BuildRequires: ghostscript
%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires: tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires: tex(latex)
%else
BuildRequires: tetex-latex
%endif
%endif
%package progs
Summary: Globus Toolkit - Common Library Programs
Group: Applications/Internet
Provides: %{name}-setup = %{setupversion}
Requires: %{name} = %{version}-%{release}
Requires: globus-libtool >= 1
Requires: globus-common-progs >= 3
Requires: globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
%if %{?rhel}%{!?rhel:0} >= 4
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires: perl
%endif
%endif
%package devel
Summary: Globus Toolkit - Common Library Development Files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: globus-libtool-devel >= 1
Requires: globus-core >= 4
Requires: pkgconfig
%package doc
Summary: Globus Toolkit - Common Library Documentation Files
Group: Documentation
Requires: %{name} = %{version}-%{release}
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif
%{!?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:
Common Library
%description progs
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}-progs package contains:
Common Library Programs
Common Setup
%description devel
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}-devel package contains:
Common Library Development Files
%description doc
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}-doc package contains:
Common Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1 -b .usr
%patch1 -p1 -b .segfault
%patch2 -p1 -b .noflavext
%patch3 -p1 -b .deps
%patch4 -p1 -b .typo
%patch5 -p1 -b .nofile
%patch6 -p1 -b .doxygen
%patch7 -p1 -b .age
%patch8 -p1 -b .extradist
%patch9 -p1 -b .ltdlmutex
cd %{_name}_setup-%{setupversion}
%patch10 -p1 -b .setup
cd -
# 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}
# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif
%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
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_!' < $f > $f.new
mv $f.new $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in
/usr/share/globus/globus-bootstrap.sh
%configure --with-flavor=%{flavor} --enable-doxygen
make %{?_smp_mflags}
# setup package
cd %{_name}_setup-%{setupversion}
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
/usr/share/globus/globus-bootstrap.sh
%configure --without-flavor --with-secure-tmpdir=/var/tmp
make %{?_smp_mflags}
cd -
%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF
# Remove libtool archives (.la files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
grep -v 'lib.*\.la$' < $l > $l.new
mv $l.new $l
done
# Remove static libraries (.a files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
grep -v 'lib.*\.a$' < $l > $l.new
mv $l.new $l
done
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
# Move globus-makefile-header to devel package
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
| grep globus-makefile-header >> \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
| grep -v globus-makefile-header > \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
| sed s!doc/%{_name}!doc/%{name}-%{version}! > \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
sed 's/P\.RS/P\n.RS/' < $f > $f.new
mv $f.new $f
done
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
| grep -v 'deprecated\.3' \
| grep -v '_%{_name}-%{version}_.*\.3' > \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
| sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
| sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
| sed 's!/man/.*!&*!' \
| sed 's!^!%doc %{_prefix}!' > package-doc.filelist
touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post progs
cd %{_datadir}/globus/setup
./findshelltools > /dev/null
cp -p globus-sh-tools-vars.sh ..
rm -f config.log config.status
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%files -f package-progs.filelist progs
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}_setup
%dir %{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/packages/setup/%{_name}_setup
%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
%dir %{_datadir}/globus/setup
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/Core
%ghost %{_datadir}/globus/setup/globus-sh-tools-vars.sh
%ghost %{_datadir}/globus/globus-sh-tools-vars.sh
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%dir %{_includedir}/globus
%{_libdir}/pkgconfig/%{name}.pc
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%changelog
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals
* Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
- Make comment about source retieval more explicit
* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
- Adapting to updated globus-core package
* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.4
- Add s390x to the list of 64 bit platforms
- Move globus-makefile-header to devel package
* Thu Jan 1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.3
- Adapt to updated GPT package
* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.2
- Update to Globus Toolkit 4.2.1
* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.1
- Autogenerated
--- NEW FILE import.log ---
globus-common-10_2-1_fc9:F-10:globus-common-10.2-1.fc9.src.rpm:1239093082
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Apr 2009 03:15:32 -0000 1.1
+++ .cvsignore 7 Apr 2009 08:31:53 -0000 1.2
@@ -0,0 +1,4 @@
+GLOBUS_LICENSE
+epstopdf-2.9.5gw
+globus_common-10.2.tar.gz
+globus_common_setup-2.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Apr 2009 03:15:32 -0000 1.1
+++ sources 7 Apr 2009 08:31:54 -0000 1.2
@@ -0,0 +1,4 @@
+2ee41112a44fe7014dce33e26468ba93 GLOBUS_LICENSE
+44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
+2a80cda660b3b8dd7d9a5c9a793497e7 globus_common-10.2.tar.gz
+7a27af5fd1f776b2390b43d94f28a5bb globus_common_setup-2.6.tar.gz
More information about the fedora-extras-commits
mailing list