rpms/grid-packaging-tools/F-10 grid-packaging-tools-age-version.patch, NONE, 1.1 grid-packaging-tools-bootstrap-shebang.patch, NONE, 1.1 grid-packaging-tools-colocate-bugfix.patch, NONE, 1.1 grid-packaging-tools-compat.patch, NONE, 1.1 grid-packaging-tools-filelists.patch, NONE, 1.1 grid-packaging-tools-flavored-headers.patch, NONE, 1.1 grid-packaging-tools-globus-package-dtd.patch, NONE, 1.1 grid-packaging-tools-gpt-update.patch, NONE, 1.1 grid-packaging-tools-helpstring.patch, NONE, 1.1 grid-packaging-tools-man.patch, NONE, 1.1 grid-packaging-tools-perlpath.patch, NONE, 1.1 grid-packaging-tools-share.patch, NONE, 1.1 grid-packaging-tools-target.patch, NONE, 1.1 grid-packaging-tools-usr.patch, NONE, 1.1 grid-packaging-tools-version-info.patch, NONE, 1.1 grid-packaging-tools-xml.patch, NONE, 1.1 grid-packaging-tools.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
Wed Mar 18 09:51:26 UTC 2009
- Previous message (by thread): rpms/ocaml-pa-do/F-10 ocaml-pa-do.spec,1.1,1.2
- Next message (by thread): rpms/grid-packaging-tools/EL-4 grid-packaging-tools-age-version.patch, NONE, 1.1 grid-packaging-tools-bootstrap-shebang.patch, NONE, 1.1 grid-packaging-tools-colocate-bugfix.patch, NONE, 1.1 grid-packaging-tools-compat.patch, NONE, 1.1 grid-packaging-tools-filelists.patch, NONE, 1.1 grid-packaging-tools-flavored-headers.patch, NONE, 1.1 grid-packaging-tools-globus-package-dtd.patch, NONE, 1.1 grid-packaging-tools-gpt-update.patch, NONE, 1.1 grid-packaging-tools-helpstring.patch, NONE, 1.1 grid-packaging-tools-man.patch, NONE, 1.1 grid-packaging-tools-perlpath.patch, NONE, 1.1 grid-packaging-tools-share.patch, NONE, 1.1 grid-packaging-tools-target.patch, NONE, 1.1 grid-packaging-tools-usr.patch, NONE, 1.1 grid-packaging-tools-version-info.patch, NONE, 1.1 grid-packaging-tools-xml.patch, NONE, 1.1 grid-packaging-tools.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/grid-packaging-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3919/F-10
Modified Files:
.cvsignore sources
Added Files:
grid-packaging-tools-age-version.patch
grid-packaging-tools-bootstrap-shebang.patch
grid-packaging-tools-colocate-bugfix.patch
grid-packaging-tools-compat.patch
grid-packaging-tools-filelists.patch
grid-packaging-tools-flavored-headers.patch
grid-packaging-tools-globus-package-dtd.patch
grid-packaging-tools-gpt-update.patch
grid-packaging-tools-helpstring.patch
grid-packaging-tools-man.patch
grid-packaging-tools-perlpath.patch
grid-packaging-tools-share.patch
grid-packaging-tools-target.patch
grid-packaging-tools-usr.patch
grid-packaging-tools-version-info.patch
grid-packaging-tools-xml.patch grid-packaging-tools.spec
import.log
Log Message:
* Mon Mar 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-16
- Adding version-info patch
grid-packaging-tools-age-version.patch:
--- NEW FILE grid-packaging-tools-age-version.patch ---
diff -ur gpt-3.2.orig/packaging_tools/perl/scripts/gpt_extract_data gpt-3.2/packaging_tools/perl/scripts/gpt_extract_data
--- gpt-3.2.orig/packaging_tools/perl/scripts/gpt_extract_data 2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/perl/scripts/gpt_extract_data 2008-06-22 22:20:27.000000000 +0200
@@ -65,7 +65,8 @@
print "GPT_NAME='$pkg->{'Name'}'\n" if defined $name;
print "GPT_MAJOR_VERSION='$pkg->{'Version'}->{'major'}'
-GPT_MINOR_VERSION='$pkg->{'Version'}->{'minor'}'\n" if defined $version;
+GPT_MINOR_VERSION='$pkg->{'Version'}->{'minor'}'
+GPT_AGE_VERSION='$pkg->{'Version'}->{'age'}'\n" if defined $version;
print "GPT_CFLAGS='$pkg->{'cflags'}'
GPT_INCLUDES='$pkg->{'external_includes'}'
@@ -96,8 +97,8 @@
=item version
-Print out version numbers as GPT_MAJOR_VERSION and GPT_MINOR_VERSION
-variables.
+Print out version numbers as GPT_MAJOR_VERSION, GPT_MINOR_VERSION and
+GPT_AGE_VERSION variables.
=item build_env
grid-packaging-tools-bootstrap-shebang.patch:
--- NEW FILE grid-packaging-tools-bootstrap-shebang.patch ---
diff -ur gpt-3.2.orig/packaging_tools/etc/gpt-bootstrap.sh gpt-3.2/packaging_tools/etc/gpt-bootstrap.sh
--- gpt-3.2.orig/packaging_tools/etc/gpt-bootstrap.sh 2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/etc/gpt-bootstrap.sh 2008-06-22 22:20:27.000000000 +0200
@@ -1,3 +1,5 @@
+#!/bin/sh
+
error()
{
echo ""
grid-packaging-tools-colocate-bugfix.patch:
--- NEW FILE grid-packaging-tools-colocate-bugfix.patch ---
diff -ur gpt-3.2.orig/packaging_tools/perl/GPT/V1/Package.pm gpt-3.2/packaging_tools/perl/GPT/V1/Package.pm
--- gpt-3.2.orig/packaging_tools/perl/GPT/V1/Package.pm 2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/perl/GPT/V1/Package.pm 2008-06-23 07:09:55.000000000 +0200
@@ -426,7 +427,7 @@
$converted->{$n} = $self->{$n};
next if ! defined $converted->{$n};
- if ($n eq 'pkg_libs') {
+ if ($n eq 'pkg_libs' and $self->{'ColocateLibraries'} ne 'no') {
$converted->{$n} =~ s!(-l\w+)\s+!$ {1}_$flavor !g;
$converted->{$n} =~ s!(-l\w+)$!$ {1}_$flavor!;
}
grid-packaging-tools-compat.patch:
--- NEW FILE grid-packaging-tools-compat.patch ---
diff -ur gpt.orig/packaging_tools/amdir/pkgdata_Makefile.am gpt/packaging_tools/amdir/pkgdata_Makefile.am
--- gpt.orig/packaging_tools/amdir/pkgdata_Makefile.am 2006-07-26 21:16:59.000000000 +0200
+++ gpt/packaging_tools/amdir/pkgdata_Makefile.am 2008-12-09 00:38:30.000000000 +0100
@@ -52,12 +52,12 @@
# kind of metadata file is missing by calling "true"
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
$(METADATA_FILES): pkg_data_src.gpt
grid-packaging-tools-filelists.patch:
--- NEW FILE grid-packaging-tools-filelists.patch ---
diff -ur gpt.orig/packaging_tools/perl/GPT/Filelist.pm gpt/packaging_tools/perl/GPT/Filelist.pm
--- gpt.orig/packaging_tools/perl/GPT/Filelist.pm 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Filelist.pm 2008-12-15 09:10:15.000000000 +0100
@@ -115,7 +115,9 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'name'} =~ /\.h$/ and $_->{'dir'} =~ m!include/$f!) {
+ if ($_->{'name'} =~ /\.h$/
+ and ($_->{'dir'} =~ m!include/$f! or
+ $_->{'dir'} =~ m!lib(64)?(/.*)?/include!)) {
push @newlist, $_;
}
}
@@ -127,7 +129,9 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'name'} =~ /\.h$/ and $_->{'dir'} !~ m!include/$f!) {
+ if ($_->{'name'} =~ /\.h$/
+ and ($_->{'dir'} !~ m!include/$f! and
+ $_->{'dir'} !~ m!lib(64)?(/.*)?/include!)) {
push @newlist, $_;
}
}
@@ -151,7 +155,7 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'dir'} =~ m!^/setup/!) {
+ if ($_->{'dir'} =~ m!(?:/|^)setup(?:/|$)!) {
push @newlist, $_;
}
}
@@ -163,7 +167,11 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'name'} =~ /\.a$/ and $_->{'dir'} =~ m!lib/*$!) {
+ if ( ( $_->{'name'} =~ m!\.a$!
+ or $_->{'name'} =~ m!^[^.]*\.so$!
+ or $_->{'name'} =~ m!^[^.]*\.sl$!
+ or $_->{'name'} =~ m!^[^.]*\.dylib$! )
+ and $_->{'name'} =~ m!^lib!) {
push @newlist, $_;
}
}
@@ -175,9 +183,9 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ( ( $_->{'name'} =~ m!\.so!
- or $_->{'name'} =~ m!\.sl!
- or $_->{'name'} =~ m!\.dylib! )
+ if ( ( $_->{'name'} =~ m!(?:\.so\.|\.[^.]+\.so)!
+ or $_->{'name'} =~ m!(?:\.sl\.|\.[^.]+\.sl)!
+ or $_->{'name'} =~ m!(?:\.dylib\.|\.[^.]+\.dylib)! )
and $_->{'name'} =~ m!^lib!) {
push @newlist, $_;
}
@@ -214,7 +222,7 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'dir'} =~ m!(?:/|^)(?:share/doc|man)(?:/|$)!) {
+ if ($_->{'dir'} =~ m!(?:/|^)(?:share/doc|man|share/man)(?:/|$)!) {
push @newlist, $_;
}
}
@@ -226,7 +234,7 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|share/globus/packages)(?:/|$)!) {
+ if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|share/man|s?bin|libexec|include|lib(64)?|setup|share/globus/packages)(?:/|$)!) {
push @newlist, $_;
}
}
diff -ur gpt.orig/packaging_tools/perl/GPT/FilelistSort.pm gpt/packaging_tools/perl/GPT/FilelistSort.pm
--- gpt.orig/packaging_tools/perl/GPT/FilelistSort.pm 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/FilelistSort.pm 2008-12-15 09:11:00.000000000 +0100
@@ -112,7 +112,9 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'name'} =~ /\.h$/ and $_->{'dir'} =~ m!include/$f!) {
+ if ($_->{'name'} =~ /\.h$/
+ and ($_->{'dir'} =~ m!include/$f! or
+ $_->{'dir'} =~ m!lib(64)?(/.*)?/include!)) {
push @newlist, $_;
}
}
@@ -124,7 +126,9 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'name'} =~ /\.h$/ and $_->{'dir'} !~ m!include/$f!) {
+ if ($_->{'name'} =~ /\.h$/
+ and ($_->{'dir'} !~ m!include/$f! and
+ $_->{'dir'} !~ m!lib(64)?(/.*)?/include!)) {
push @newlist, $_;
}
}
@@ -148,7 +152,7 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'dir'} =~ m!^/setup/!) {
+ if ($_->{'dir'} =~ m!(?:/|^)setup(?:/|$)!) {
push @newlist, $_;
}
}
@@ -160,9 +164,11 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- # Changed to allow for lib/subdir/lib.a while still allowing
- # lib/lib.a, where apparently the dir is just lib, not lib/
- if ($_->{'name'} =~ /\.a$/ and $_->{'dir'} =~ m!lib$|lib/!) {
+ if ( ( $_->{'name'} =~ m!\.a$!
+ or $_->{'name'} =~ m!^[^.]*\.so$!
+ or $_->{'name'} =~ m!^[^.]*\.sl$!
+ or $_->{'name'} =~ m!^[^.]*\.dylib$! )
+ and $_->{'name'} =~ m!^lib!) {
push @newlist, $_;
}
}
@@ -174,9 +180,9 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ( ( $_->{'name'} =~ m!\.so!
- or $_->{'name'} =~ m!\.sl!
- or $_->{'name'} =~ m!\.dylib! )
+ if ( ( $_->{'name'} =~ m!(?:\.so\.|\.[^.]+\.so)!
+ or $_->{'name'} =~ m!(?:\.sl\.|\.[^.]+\.sl)!
+ or $_->{'name'} =~ m!(?:\.dylib\.|\.[^.]+\.dylib)! )
and $_->{'name'} =~ m!^lib!) {
push @newlist, $_;
}
@@ -213,7 +219,7 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'dir'} =~ m!(?:/|^)(?:share/doc|man)(?:/|$)!) {
+ if ($_->{'dir'} =~ m!(?:/|^)(?:share/doc|man|share/man)(?:/|$)!) {
push @newlist, $_;
}
}
@@ -225,7 +231,7 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
- if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|share/globus/packages)(?:/|$)!) {
+ if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|share/man|s?bin|libexec|include|lib(64)?|setup|share/globus/packages)(?:/|$)!) {
push @newlist, $_;
}
}
diff -ur gpt.orig/packaging_tools/perl/GPT/MyFilelists.pm gpt/packaging_tools/perl/GPT/MyFilelists.pm
--- gpt.orig/packaging_tools/perl/GPT/MyFilelists.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/MyFilelists.pm 2008-12-15 09:07:13.000000000 +0100
@@ -68,6 +68,12 @@
push @$result, @$list;
$me->{'filelist'}->reset();
+ $me->{'filelist'}->flavored_files() if defined $me->{'mangling'};
+ $me->{'filelist'}->extract_libtool_libs();
+ $list = $me->{'filelist'}->get_list();
+ push @$result, @$list;
+ $me->{'filelist'}->reset();
+
$me->{'filelist'}->extract_perl_modules();
$list = $me->{'filelist'}->get_list();
push @$result, @$list;
@@ -85,12 +91,6 @@
push @$result, @$list;
$me->{'filelist'}->reset();
- $me->{'filelist'}->flavored_files() if defined $me->{'mangling'};
- $me->{'filelist'}->extract_libtool_libs();
- $list = $me->{'filelist'}->get_list();
- push @$result, @$list;
- $me->{'filelist'}->reset();
-
$me->{'filelist'}->flavored_headers() if defined $me->{'mangling'};
$me->{'filelist'}->add_package_metadata_files('dev');
$list = $me->{'filelist'}->get_list();
grid-packaging-tools-flavored-headers.patch:
--- NEW FILE grid-packaging-tools-flavored-headers.patch ---
--- gpt-3.2.orig/packaging_tools/perl/GPT/MyFilelists.pm 2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/perl/GPT/MyFilelists.pm 2008-06-22 22:20:27.000000000 +0200
@@ -91,7 +91,7 @@
push @$result, @$list;
$me->{'filelist'}->reset();
- $me->{'filelist'}->flavored_headers() if defined $me->{'mangling'};
+ $me->{'filelist'}->flavored_headers();
$me->{'filelist'}->add_package_metadata_files('dev');
$list = $me->{'filelist'}->get_list();
push @$result, @$list;
grid-packaging-tools-globus-package-dtd.patch:
--- NEW FILE grid-packaging-tools-globus-package-dtd.patch ---
diff -ur gpt-3.2.orig/packaging_tools/etc/globus_package.dtd gpt-3.2/packaging_tools/etc/globus_package.dtd
--- gpt-3.2.orig/packaging_tools/etc/globus_package.dtd 2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/etc/globus_package.dtd 2008-07-02 10:07:19.000000000 +0200
@@ -3,8 +3,8 @@
Description,
Functional_Group,
Version_Stability,
- VersionLabel,
- PackagingTool,
+ VersionLabel?,
+ PackagingTool?,
(data_pkg |
dev_pkg |
doc_pkg |
@@ -46,41 +46,43 @@
ToolName CDATA #REQUIRED
ToolVersion CDATA #REQUIRED
>
-<!ELEMENT src_pkg (Version_Label,
+<!ELEMENT src_pkg (Version_Label?,
With_Flavors,
Source_Dependencies*,
Source_Setup_Dependency*,
- Build_Instructions,
- Environment,
- Post_Install_Message,
- Post_Install_Program,
- Setup)>
-<!ELEMENT pgm_pkg (Version_Label,
+ Build_Instructions?,
+ Build_Environment,
+ Post_Install_Message*,
+ Post_Install_Program*,
+ Setup*)>
+<!ELEMENT pgm_pkg (Version_Label?,
Flavor,
Binary_Dependencies*,
Setup_Dependency*,
Post_Install_Message*,
Post_Install_Program*,
Setup*)>
-<!ELEMENT pgm_static_pkg (Version_Label,
+<!ELEMENT pgm_static_pkg (Version_Label?,
Flavor,
Binary_Dependencies*,
Setup_Dependency*,
Post_Install_Message*,
Post_Install_Program*,
Setup*)>
-<!ELEMENT dev_pkg (Version_Label,
+<!ELEMENT dev_pkg (Version_Label?,
Flavor,
Binary_Dependencies*,
- Environment?)>
-<!ELEMENT rtl_pkg (Version_Label,
+ Build_Environment?)>
+<!ELEMENT rtl_pkg (Version_Label?,
Flavor,
Binary_Dependencies*,
Setup_Dependency*)>
-<!ELEMENT data_pkg (Version_Label,
+<!ELEMENT data_pkg (Version_Label?,
+ Flavor?,
Binary_Dependencies*,
Setup_Dependency*)>
-<!ELEMENT doc_pkg (Version_Label,
+<!ELEMENT doc_pkg (Version_Label?,
+ Flavor?,
Binary_Dependencies*,
Setup_Dependency*)>
<!ELEMENT Flavor (#PCDATA)>
@@ -145,28 +147,22 @@
pgm |
rtl) #REQUIRED
>
-<!ELEMENT Environment (Cflags?,
- PackageLibs?,
- ExternalLibs?,
- ExternalIncludes?
- Variable?
- SourcedFile?
+<!ELEMENT Build_Environment (cflags?,
+ external_includes?,
+ pkg_libs?,
+ external_libs?
)>
-<!ELEMENT Cflags (#PCDATA)>
-<!ELEMENT ExternalIncludes (#PCDATA)>
-<!ELEMENT PackageLibs (#PCDATA)>
-<!ELEMENT ExternalLibs (#PCDATA)>
-<!ELEMENT Variable EMPTY>
-<!ATTLIST Variable Name CDATA #REQUIRED Value CDATA #REQUIRED>
-<!ELEMENT SourcedFile (#PCDATA)>
-<!ATTLIST SourcedFile Shell (sh | csh) #REQUIRED>
+<!ELEMENT cflags (#PCDATA)>
+<!ELEMENT external_includes (#PCDATA)>
+<!ELEMENT pkg_libs (#PCDATA)>
+<!ELEMENT external_libs (#PCDATA)>
<!ELEMENT Build_Instructions (Build_Step*, flavor_choice*)>
-<!ATTLIST Build_Instructions SrcDir CDATA>
+<!ATTLIST Build_Instructions SrcDir CDATA #IMPLIED>
<!ELEMENT Build_Step (#PCDATA)>
<!ATTLIST Build_Step
- Macro_Args CDATA #REQUIRED
+ Macro_Args CDATA #IMPLIED
>
<!ELEMENT Setup (Aging_Version)>
<!ATTLIST Setup
grid-packaging-tools-gpt-update.patch:
--- NEW FILE grid-packaging-tools-gpt-update.patch ---
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-update gpt/packaging_tools/perl/scripts/gpt-update
--- gpt.orig/packaging_tools/perl/scripts/gpt-update 2008-10-04 19:39:36.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-update 2008-10-04 19:51:59.000000000 +0200
@@ -5,12 +5,7 @@
die "GPT requires at least Perl version 5.005";
}
-system("./gpt_version") == 0
- or die "GPT died due to Version mismatch. Check PATH and GPT_LOCATION\n" ;
-
-
my $gpath = $ENV{GPT_LOCATION};
-my $globus_path = $ENV{GLOBUS_LOCATION};
if (!defined($gpath))
{
@@ -19,11 +14,14 @@
if (!defined($gpath))
{
- error_out("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
+ error_out("GPT_LOCATION needs to be set before running this script");
}
@INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
+system("$gpath/sbin/gpt_version") == 0
+ or die "GPT died due to Version mismatch. Check PATH and GPT_LOCATION\n" ;
+
if ( ! ( defined eval "require Grid::GPT::GPTObject" ) )
{
die("$gpath does not appear to hold a valid GPT installation\n");
grid-packaging-tools-helpstring.patch:
--- NEW FILE grid-packaging-tools-helpstring.patch ---
diff -ur gpt.orig/packaging_tools/etc/gpt_autoconf_macros.m4 gpt/packaging_tools/etc/gpt_autoconf_macros.m4
--- gpt.orig/packaging_tools/etc/gpt_autoconf_macros.m4 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/etc/gpt_autoconf_macros.m4 2008-10-05 18:41:41.000000000 +0200
@@ -27,7 +27,7 @@
GPT_LINKTYPE="shared"
# We have to figure out if we're linking only static before build_config
AC_ARG_ENABLE(static-only,
- [ --enable-static-only Don't do any dynamic linking],
+ AC_HELP_STRING([--enable-static-only], [Don't do any dynamic linking]),
[
case $enableval in
grid-packaging-tools-man.patch:
--- NEW FILE grid-packaging-tools-man.patch ---
diff -ur gpt.orig/packaging_tools/Makefile.am gpt/packaging_tools/Makefile.am
--- gpt.orig/packaging_tools/Makefile.am 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/Makefile.am 2008-10-04 14:58:13.000000000 +0200
@@ -182,11 +182,12 @@
install-pod2man:
@if test "X$(POD2MAN)" != "X"; then \
- $(mkinstalldirs) $(DESTDIR)man/man1; \
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8; \
list='$(sbin_SCRIPTS)'; for p in $$list; do \
+ grep -q ^= $$p || continue; \
script=`echo $$p | sed 's!perl/scripts/!!'`; \
- echo "Generating $(DESTDIR)$(prefix)/man/man1/$$script.1"; \
- $(POD2MAN) $$p > $(DESTDIR)$(prefix)/man/man1/$$script.1; \
+ echo "Generating $(DESTDIR)$(mandir)/man8/$$script.8"; \
+ $(POD2MAN) --section 8 $$p > $(DESTDIR)$(mandir)/man8/$$script.8; \
done \
else \
echo "Skipping Man page installation"; \
diff -ur gpt.orig/packaging_tools/Makefile.in gpt/packaging_tools/Makefile.in
--- gpt.orig/packaging_tools/Makefile.in 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/Makefile.in 2008-10-04 14:58:13.000000000 +0200
@@ -846,11 +846,12 @@
install-pod2man:
@if test "X$(POD2MAN)" != "X"; then \
- $(mkinstalldirs) $(DESTDIR)man/man1; \
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8; \
list='$(sbin_SCRIPTS)'; for p in $$list; do \
+ grep -q ^= $$p || continue; \
script=`echo $$p | sed 's!perl/scripts/!!'`; \
- echo "Generating $(DESTDIR)$(prefix)/man/man1/$$script.1"; \
- $(POD2MAN) $$p > $(DESTDIR)$(prefix)/man/man1/$$script.1; \
+ echo "Generating $(DESTDIR)$(mandir)/man8/$$script.8"; \
+ $(POD2MAN) --section 8 $$p > $(DESTDIR)$(mandir)/man8/$$script.8; \
done \
else \
echo "Skipping Man page installation"; \
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-build gpt/packaging_tools/perl/scripts/gpt-build
--- gpt.orig/packaging_tools/perl/scripts/gpt-build 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-build 2008-10-04 15:05:17.000000000 +0200
@@ -620,7 +620,7 @@
pkg_data_src.gpt. If no instructions are found the script uses the
default instructions described in I<Grid::GPT::PkgMngmt::Build>.
-Multiple packages can be built by passing in multiple i<-srcdir>
+Multiple packages can be built by passing in multiple I<-srcdir>
arguments or multiple source packages and or bundles. For now these
have to be passed in in dependent order ie. if package foo needs
package fee's headers to build then fee should come first.
@@ -634,7 +634,7 @@
Build flavors are character string labels that represent a set of
compiler and linker options defined during the building of the
globus_core package. Predefined flavors can be listed by using the
-B<globus_flavor_configuration> script. Packages can be built with any
+B<gpt-flavor-configuration> script. Packages can be built with any
installed flavor. globus_core can only be built with pre-defined
flavors. globus_core needs to be built by hand
(i.e. ./configure|make|make install) to install a custom build flavor.
@@ -770,7 +770,7 @@
=head1 SEE ALSO
-gpt-pkg(1) gpt-bundle(1) gpt-install(1) BuildMacros(3)
+gpt-pkg(8) gpt-bundle(8) gpt-install(8) BuildMacros(3)
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_build_config gpt/packaging_tools/perl/scripts/gpt_build_config
--- gpt.orig/packaging_tools/perl/scripts/gpt_build_config 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt_build_config 2008-10-04 14:58:13.000000000 +0200
@@ -177,15 +177,15 @@
=head1 NAME
-B<globus_build_config> - Returns a minimized list of ldflags from a list of globus packages and external libraries.
+B<gpt_build_config> - Returns a minimized list of ldflags from a list of globus packages and external libraries.
=head1 SYNOPSIS
-globus_build_config -src <source metadata file> CB-f <globus_flavor_name> -link [static|shared]
+gpt_build_config -src <source metadata file> -f <globus_flavor_name> -link [static|shared]
=head1 DESCRIPTION
-B<globus_build_config.pl> creates a file in it's current directory named
+B<gpt_build_config> creates a file in it's current directory named
gpt_build_temp.sh that contains a list of necessary flags assembled from
the build environment metadata of the packages on which the source metadata
depends.
@@ -194,7 +194,7 @@
=head1 LINK ORDER
-The flag list returned by B<globus_build_config.pl> is assembled in
+The flag list returned by B<gpt_build_config> is assembled in
dependent order. A dependency between two libraries occurs when one
library needs the symbols of another library in order to link
correctly. For most linkers the library providing the symbols has to
@@ -203,7 +203,7 @@
-L/opt/Xpm/lib -lXpm -L/usr/lib/X11 -lXm -lX
-B<gpt_build_config> assumes that the library Xpm is dependent on Xm which in turn is dependent on X. In addition, B<globus_build_config.pl> assumes that Xpm is located in /opt/Xpm/lib and Xm and X are both located in /usr/lib/X11.
+B<gpt_build_config> assumes that the library Xpm is dependent on Xm which in turn is dependent on X. In addition, B<gpt_build_config> assumes that Xpm is located in /opt/Xpm/lib and Xm and X are both located in /usr/lib/X11.
=head1 BUGS
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-bundle gpt/packaging_tools/perl/scripts/gpt-bundle
--- gpt.orig/packaging_tools/perl/scripts/gpt-bundle 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-bundle 2008-10-04 15:06:03.000000000 +0200
@@ -1106,7 +1106,7 @@
=head1 SEE ALSO
-gpt-build(1) gpt-install(1) gpt-pkg(1)
+gpt-build(8) gpt-install(8) gpt-pkg(8)
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-convert-bundle-old2new gpt/packaging_tools/perl/scripts/gpt-convert-bundle-old2new
--- gpt.orig/packaging_tools/perl/scripts/gpt-convert-bundle-old2new 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-convert-bundle-old2new 2008-10-04 15:08:42.000000000 +0200
@@ -165,7 +165,7 @@
=head1 SEE ALSO
-globus-build(1) globus-install(1)
+globus-build(8) globus-install(8)
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-deps gpt/packaging_tools/perl/scripts/gpt-deps
--- gpt.orig/packaging_tools/perl/scripts/gpt-deps 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-deps 2008-10-04 15:06:27.000000000 +0200
@@ -182,7 +182,7 @@
=head1 SEE ALSO
-gpt-install(1) gpt-verify(1) gpt-query(1) gpt-postinstall(1)
+gpt-install(8) gpt-verify(8) gpt-query(8) gpt-postinstall(8)
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data gpt/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data
--- gpt.orig/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data 2008-10-04 14:58:13.000000000 +0200
@@ -79,65 +79,3 @@
}
__END__
-
-=head1 NAME
-
-B<globus_build_config.pl> - Returns a minimized list of ldflags from a list of globus packages and external libraries.
-
-=head1 SYNOPSIS
-
-globus_build_config.pl [--ldflags="<extra ld flags>"] --flavor=<globus_flavor_name> <dependent packages list>
-
-=head1 DESCRIPTION
-
-B<globus_build_config.pl> returns a list of ldflags. It builds this
-list from the ld flags passed in as well as from scanning the
-build_dependencies file of each package passed in as a dependency.
-This scanning is done recursively to cover the entire dependency tree.
-This script is based on the shell script gnome_config.
-
-=head1 LINK ORDER
-
-The flag list returned by B<globus_build_config.pl> is assembled in
-dependent order. A dependency between two libraries occurs when one
-library needs the symbols of another library in order to link
-correctly. For most linkers the library providing the symbols has to
-be linked after the library that needs the symbols. For
-example, from the line:
-
- -L/opt/Xpm/lib -lXpm -L/usr/lib/X11 -lXm -lX
-
-B<globus_build_config.pl> assumes that the library Xpm is dependent on Xm which in turn is dependent on X. In addition, B<globus_build_config.pl> assumes that Xpm is located in /opt/Xpm/lib and Xm and X are both located in /usr/lib/X11.
-
-=head1 MINIMIZATION
-
-B<globus_build_config.pl> makes sure that every library is listed only once. The purpose of this is to reduce the size of the linking command and make the linking behavior more predictable. Here is an example of minimization:
-
- Before: -lm -L/home/mystuff/lib -lXm -L$(GLOBUS_INSTALL_PATH)/lib \
--lfum_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib -ldee \
--L$(GLOBUS_INSTALL_PATH)/lib -lfoo_$(GLOBUS_FLAVOR_NAME) -lm -L/usr/local/lib \
--lX -L$(GLOBUS_INSTALL_PATH)/lib -lfee_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib \
--ldum
-
- After: -L/home/mystuff/lib -lXm -L$(GLOBUS_INSTALL_PATH)/lib \
--lfum_$(GLOBUS_FLAVOR_NAME) -L/opt/dum/lib -ldee -L$(GLOBUS_INSTALL_PATH)/lib \
--lfoo_$(GLOBUS_FLAVOR_NAME) -L/usr/local/lib -lX -L$(GLOBUS_INSTALL_PATH)/lib \
--lfee_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib -ldum
-
-Notice that in the After, -lm is listed only once near the end of the list.
-
-=head1 BUGS
-
-Circular dependencies between libraries are not supported. These
-dependencies are usually resolved by listing one of the libraries
-before and after its co-dependent library (ie. -lfoo -lfee -lfoo).
-B<globus_build_config.pl> will eliminate the first -lfoo because of
-minimization.
-
-
-=head1 AUTHOR
-
-Michael Bletzinger E<lt>mbletzin.ncsa.uiuc.eduE<gt> and Eric Blau
-E<lt>eblau.ncsa.uiuc.eduE<gt>
-
-=cut
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-pkg gpt/packaging_tools/perl/scripts/gpt-pkg
--- gpt.orig/packaging_tools/perl/scripts/gpt-pkg 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-pkg 2008-10-04 15:08:24.000000000 +0200
@@ -237,7 +237,7 @@
=head1 SEE ALSO
-gpt-bundle(1) gpt-install(1) gpt-build(1)
+gpt-bundle(8) gpt-install(8) gpt-build(8)
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-query gpt/packaging_tools/perl/scripts/gpt-query
--- gpt.orig/packaging_tools/perl/scripts/gpt-query 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-query 2008-10-04 15:04:33.000000000 +0200
@@ -461,7 +461,7 @@
=head1 SEE ALSO
-gpt-install(1) gpt-uninstall(1) gpt-verify(1) gpt-postinstall(1)
+gpt-install(8) gpt-uninstall(8) gpt-verify(8) gpt-postinstall(8)
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_save_flavor gpt/packaging_tools/perl/scripts/gpt_save_flavor
--- gpt.orig/packaging_tools/perl/scripts/gpt_save_flavor 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt_save_flavor 2008-10-04 14:58:13.000000000 +0200
@@ -75,65 +75,3 @@
__END__
-
-=head1 NAME
-
-B<globus_build_config.pl> - Returns a minimized list of ldflags from a list of globus packages and external libraries.
-
-=head1 SYNOPSIS
-
-globus_build_config.pl [--ldflags="<extra ld flags>"] --flavor=<globus_flavor_name> <dependent packages list>
-
-=head1 DESCRIPTION
-
-B<globus_build_config.pl> returns a list of ldflags. It builds this
-list from the ld flags passed in as well as from scanning the
-build_dependencies file of each package passed in as a dependency.
-This scanning is done recursively to cover the entire dependency tree.
-This script is based on the shell script gnome_config.
-
-=head1 LINK ORDER
-
-The flag list returned by B<globus_build_config.pl> is assembled in
-dependent order. A dependency between two libraries occurs when one
-library needs the symbols of another library in order to link
-correctly. For most linkers the library providing the symbols has to
-be linked after the library that needs the symbols. For
-example, from the line:
-
- -L/opt/Xpm/lib -lXpm -L/usr/lib/X11 -lXm -lX
-
-B<globus_build_config.pl> assumes that the library Xpm is dependent on Xm which in turn is dependent on X. In addition, B<globus_build_config.pl> assumes that Xpm is located in /opt/Xpm/lib and Xm and X are both located in /usr/lib/X11.
-
-=head1 MINIMIZATION
-
-B<globus_build_config.pl> makes sure that every library is listed only once. The purpose of this is to reduce the size of the linking command and make the linking behavior more predictable. Here is an example of minimization:
-
- Before: -lm -L/home/mystuff/lib -lXm -L$(GLOBUS_INSTALL_PATH)/lib \
--lfum_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib -ldee \
--L$(GLOBUS_INSTALL_PATH)/lib -lfoo_$(GLOBUS_FLAVOR_NAME) -lm -L/usr/local/lib \
--lX -L$(GLOBUS_INSTALL_PATH)/lib -lfee_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib \
--ldum
-
- After: -L/home/mystuff/lib -lXm -L$(GLOBUS_INSTALL_PATH)/lib \
--lfum_$(GLOBUS_FLAVOR_NAME) -L/opt/dum/lib -ldee -L$(GLOBUS_INSTALL_PATH)/lib \
--lfoo_$(GLOBUS_FLAVOR_NAME) -L/usr/local/lib -lX -L$(GLOBUS_INSTALL_PATH)/lib \
--lfee_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib -ldum
-
-Notice that in the After, -lm is listed only once near the end of the list.
-
-=head1 BUGS
-
-Circular dependencies between libraries are not supported. These
-dependencies are usually resolved by listing one of the libraries
-before and after its co-dependent library (ie. -lfoo -lfee -lfoo).
-B<globus_build_config.pl> will eliminate the first -lfoo because of
-minimization.
-
-
-=head1 AUTHOR
-
-Michael Bletzinger E<lt>mbletzin.ncsa.uiuc.eduE<gt> and Eric Blau
-E<lt>eblau.ncsa.uiuc.eduE<gt>
-
-=cut
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-setup gpt/packaging_tools/perl/scripts/gpt-setup
--- gpt.orig/packaging_tools/perl/scripts/gpt-setup 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-setup 2008-10-04 15:06:46.000000000 +0200
@@ -42,7 +42,7 @@
# sub pod2usage {
# my $ex = shift;
-# print "gpt_setup -name=<Package Name> -version=<Major.Minor.Age> [-nocomments -verbose -help -v ] source_dir build_dir\n";
+# print "gpt-setup -name=<Package Name> -version=<Major.Minor.Age> [-nocomments -verbose -help -v ] source_dir build_dir\n";
# exit $ex;
# }
@@ -605,16 +605,16 @@
=head1 NAME
-B<gpt_setup> - Create automake and autoconf files to convert
+B<gpt-setup> - Create automake and autoconf files to convert
software into a package
=head1 SYNOPSIS
-gpt_setup name version [directory_containing_source_code] [build_directory]
+gpt-setup name version [directory_containing_source_code] [build_directory]
=head1 DESCRIPTION
-B<gpt_setup> creates Makefile.am files and a configure.in file as well
+B<gpt-setup> creates Makefile.am files and a configure.in file as well
as other stuff that is used to convert a software distribution into a
globus package. I<name> is the name of the package. I<version> is the
version of the package. I<directory_containing_source_code> is the
@@ -623,15 +623,15 @@
the resulting binaries (default is the source directory). The
resulting build depends on other files from the globus packaging tools
(GPT) as well as the globus_core package. B<NOTE> that the files that
-gpt_setup creates need to be edited by hand in order for the packaging
-to be complete. The idea behind gpt_setup is simple; "It is easier to
+gpt-setup creates need to be edited by hand in order for the packaging
+to be complete. The idea behind gpt-setup is simple; "It is easier to
edit than to create.".
-=head1 Description of the Files that B<gpt_setup> Creates
+=head1 Description of the Files that B<gpt-setup> Creates
=over 4
-=item B<Makefile.am>. B<gpt_setup> creates a Makefile.am in the top
+=item B<Makefile.am>. B<gpt-setup> creates a Makefile.am in the top
level directory and every subdirectory except for those called CVS or
RCS. The Makefile.am files contain a list of sources, subdirectories,
libraries, programs, and scripts. All libraries will be built as
@@ -642,21 +642,21 @@
directives to include files from globus_core that contain standard
make targets and rules.
-=item B<configure.in> B<gpt_setup> creates a top level configure.in
+=item B<configure.in> B<gpt-setup> creates a top level configure.in
containing the standard GLOBUS_* macros from globus_core. The script
detects the occurance of *.in files and headers and adds them to
AM_CONFIG_HEADER and AC_OUTPUT.
-=item B<bootstrap> B<gpt_setup> creates a top level bootstrap script
+=item B<bootstrap> B<gpt-setup> creates a top level bootstrap script
which is used to invoke aclocal, automake, autoheader, and autoconf in
the correct order.
-=item B<pkgdata> B<gpt_setup> creates a pkgdata directory that contains the following:
+=item B<pkgdata> B<gpt-setup> creates a pkgdata directory that contains the following:
=over 4
=item B<pkg_data_src.gpt.in> is a file that contains the packaging
-metadata for the newly created package. B<gpt_setup> inserts the name
+metadata for the newly created package. B<gpt-setup> inserts the name
and version of the package as well as a list of all of the libraries
that the package provides.
@@ -672,10 +672,10 @@
=back
-=head1 Post gpt_setup Tasks (What is Left to the Developer)
+=head1 Post gpt-setup Tasks (What is Left to the Developer)
-B<gpt_setup> does not do everything that is needed to compile a
+B<gpt-setup> does not do everything that is needed to compile a
package. Some tasks need a developer's touch. Here is a checklist of
tasks that may need to be done by hand:
@@ -683,7 +683,7 @@
=item Dependencies need to be added to pkgdata/pkg_data_src.gpt.in
-You can use the GUI tool B<gpt_edit> or edit the file by hand. The
+You can use the GUI tool B<gpt-edit> or edit the file by hand. The
format is explained in B<Package>, B<SourceDependency>, and
B<Version>.
@@ -698,7 +698,7 @@
=item Source needs to be assigned to programs and libraries in the Makefile.am's.
-B<gpt_edit> automatically assigns all source found in a directory to
+B<gpt-edit> automatically assigns all source found in a directory to
all of the targets found in a directory. For example:
Sources = \
@@ -719,7 +719,7 @@
=item Autoconf defines need to be tested for
-Use B<gpt_undefines> to identify all of the preprocesser macros that
+Use B<gpt-undefines> to identify all of the preprocesser macros that
are used in the source code which are not defined internally. This
list will highlight the autoconf tests that need to be added to the
configure.in script.
@@ -728,7 +728,7 @@
=head1 SEE ALSO
-gpt_edit(1) gpt_undefines(1) automake(1) autoconf(1) Package(3) Version(3) SourceDependency(3)
+gpt-edit(8) gpt-undefines(8) automake(1) autoconf(1) Package(3) Version(3) SourceDependency(3)
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-undefines gpt/packaging_tools/perl/scripts/gpt-undefines
--- gpt.orig/packaging_tools/perl/scripts/gpt-undefines 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-undefines 2008-10-04 14:58:13.000000000 +0200
@@ -44,7 +44,7 @@
# sub pod2usage {
# my $ex = shift;
-# print "gpt_undefines [-srcdir=PATH -config -disable-undefs -verbose -help] headers containing defines\n";
+# print "gpt-undefines [-srcdir=PATH -config -disable-undefs -verbose -help] headers containing defines\n";
# exit $ex;
# }
@@ -207,17 +207,17 @@
=head1 NAME
-B<gpt_undefines> - Generate a list of preprocessor macros that are not defined.
+B<gpt-undefines> - Generate a list of preprocessor macros that are not defined.
=head1 SYNOPSIS
-gpt_undefines [-srcdir=PATH -config -disable-undefs -verbose -help] headers containing defines
+gpt-undefines [-srcdir=PATH -config -disable-undefs -verbose -help] headers containing defines
=head1 DESCRIPTION
-B<gpt_undefines> Generates a list of preprocessor macros that are not
+B<gpt-undefines> Generates a list of preprocessor macros that are not
defined internally in the source code. Macros that are defined in the
-header files listed during B<gpt_undefines>'s invocation will also be
+header files listed during B<gpt-undefines>'s invocation will also be
excluded.
=head1 OPTIONS
@@ -228,7 +228,7 @@
Use PATH as the directory containing the source code. Source code in
the entire directory tree will be scanned. Default PATH is the
-directory B<gpt_undefines> was invoked in.
+directory B<gpt-undefines> was invoked in.
=item -config
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-uninstall gpt/packaging_tools/perl/scripts/gpt-uninstall
--- gpt.orig/packaging_tools/perl/scripts/gpt-uninstall 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-uninstall 2008-10-04 15:03:35.000000000 +0200
@@ -228,7 +228,7 @@
=head1 SEE ALSO
-gpt-install(1) gpt-query(1) gpt-verify(1) gpt-postinstall(1)
+gpt-install(8) gpt-query(8) gpt-verify(8) gpt-postinstall(8)
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-verify gpt/packaging_tools/perl/scripts/gpt-verify
--- gpt.orig/packaging_tools/perl/scripts/gpt-verify 2008-10-04 13:15:47.000000000 +0200
+++ gpt/packaging_tools/perl/scripts/gpt-verify 2008-10-04 15:04:09.000000000 +0200
@@ -261,7 +261,7 @@
=head1 SEE ALSO
-gpt-install(1) gpt-uninstall(1) gpt-query(1) gpt-postinstall(1)
+gpt-install(8) gpt-uninstall(8) gpt-query(8) gpt-postinstall(8)
=head1 AUTHOR
grid-packaging-tools-perlpath.patch:
--- NEW FILE grid-packaging-tools-perlpath.patch ---
diff -ur gpt.orig/packaging_tools/configure gpt/packaging_tools/configure
--- gpt.orig/packaging_tools/configure 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/configure 2008-10-04 10:57:47.000000000 +0200
@@ -273,7 +273,7 @@
PACKAGE_BUGREPORT=''
ac_unique_file="Makefile.am"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN TAR GUNZIP GZIP LN_S GPT_LOCATION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S GPT_LOCATION LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -796,7 +796,10 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-perl=<path> specify path to perl binary
+ --with-perl=PATH path to perl binary
+ --with-perlmoduledir=DIR
+ perl module installation directory
+ [PREFIX/lib/perl]
_ACEOF
fi
@@ -1842,7 +1845,34 @@
-#echo "POD2MAN=$POD2MAN"
+
+# Check whether --with-perlmoduledir was given.
+if test "${with_perlmoduledir+set}" = set; then
+ withval=$with_perlmoduledir;
+ case $withval in
+ no)
+ echo "--with-perlmoduledir requires an argument" >&2
+ exit 1
+ ;;
+ yes)
+ echo "--with-perlmoduledir requires an argument" >&2
+ exit 1
+ ;;
+ *)
+ perlmoduledir=$withval
+ ;;
+ esac
+
+else
+
+ perlmoduledir='${prefix}/lib/perl'
+
+
+fi
+
+
+
+
# checking for the GPT_LOCATION
@@ -2675,6 +2705,7 @@
s, at am__leading_dot@,$am__leading_dot,;t t
s, at PERL@,$PERL,;t t
s, at POD2MAN@,$POD2MAN,;t t
+s, at perlmoduledir@,$perlmoduledir,;t t
s, at TAR@,$TAR,;t t
s, at GUNZIP@,$GUNZIP,;t t
s, at GZIP@,$GZIP,;t t
diff -ur gpt.orig/packaging_tools/configure.ac gpt/packaging_tools/configure.ac
--- gpt.orig/packaging_tools/configure.ac 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/configure.ac 2008-10-04 10:57:47.000000000 +0200
@@ -8,7 +8,7 @@
AC_ARG_WITH([perl],
-[ --with-perl=<path> specify path to perl binary ],
+AC_HELP_STRING([--with-perl=PATH], [path to perl binary]),
[
case $withval in
no)
@@ -21,7 +21,6 @@
;;
*)
PERL=$withval
- AC_SUBST(PERL)
POD2MAN=`echo $PERL | sed 's!bin/perl!bin/pod2man!'`
if ! test -f $POD2MAN; then
POD2MAN=
@@ -35,11 +34,36 @@
]
)
+AC_SUBST(PERL)
+AC_SUBST(POD2MAN)
-AC_SUBST(POD2MAN)
+AC_ARG_WITH([perlmoduledir],
+
+AC_HELP_STRING([--with-perlmoduledir=DIR],
+[perl module installation directory [[PREFIX/lib/perl]]]),
+[
+ case $withval in
+ no)
+ echo "--with-perlmoduledir requires an argument" >&2
+ exit 1
+ ;;
+ yes)
+ echo "--with-perlmoduledir requires an argument" >&2
+ exit 1
+ ;;
+ *)
+ perlmoduledir=$withval
+ ;;
+ esac
+],
+[
+ perlmoduledir='${prefix}/lib/perl'
+]
+)
+
+AC_SUBST(perlmoduledir)
-#echo "POD2MAN=$POD2MAN"
# checking for the GPT_LOCATION
diff -ur gpt.orig/packaging_tools/Makefile.am gpt/packaging_tools/Makefile.am
--- gpt.orig/packaging_tools/Makefile.am 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/Makefile.am 2008-10-04 10:57:47.000000000 +0200
@@ -39,7 +39,7 @@
gptexecshare_SCRIPTS = config.guess
-gptmodulesdir = ${prefix}/lib/perl/Grid/GPT
+gptmodulesdir = $(perlmoduledir)/Grid/GPT
gptmodules_DATA = \
perl/GPT/Algorithms.pm \
@@ -175,7 +175,9 @@
install-localize:
@echo "Localizing scripts to $(PERL)"
+ PERLLIB=$(DESTDIR)$(perlmoduledir) \
$(PERL) $(DESTDIR)$(sbindir)/gpt-config -perl=$(PERL) \
+ -location=$(DESTDIR)$(prefix) \
-probe \
-ignore-errors
diff -ur gpt.orig/packaging_tools/Makefile.in gpt/packaging_tools/Makefile.in
--- gpt.orig/packaging_tools/Makefile.in 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/Makefile.in 2008-10-04 10:57:47.000000000 +0200
@@ -98,6 +98,7 @@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
+perlmoduledir = @perlmoduledir@
prefix = $(GPT_LOCATION)
program_transform_name = @program_transform_name@
sbindir = @sbindir@
@@ -148,7 +149,7 @@
gptexecshare_SCRIPTS = config.guess
-gptmodulesdir = ${prefix}/lib/perl/Grid/GPT
+gptmodulesdir = $(perlmoduledir)/Grid/GPT
gptmodules_DATA = \
perl/GPT/Algorithms.pm \
@@ -840,7 +841,9 @@
install-localize:
@echo "Localizing scripts to $(PERL)"
+ PERLLIB=$(DESTDIR)$(perlmoduledir) \
$(PERL) $(DESTDIR)$(sbindir)/gpt-config -perl=$(PERL) \
+ -location=$(DESTDIR)$(prefix) \
-probe \
-ignore-errors
diff -ur gpt.orig/packaging_tools/perl/GPT/Localize.pm gpt/packaging_tools/perl/GPT/Localize.pm
--- gpt.orig/packaging_tools/perl/GPT/Localize.pm 2007-06-24 22:26:36.000000000 +0200
+++ gpt/packaging_tools/perl/GPT/Localize.pm 2008-10-04 10:57:47.000000000 +0200
@@ -49,7 +49,6 @@
sub new {
my ($that, %args) = @_;
- push @INC,
my $class = ref($that) || $that;
my $me = {
ignore_errors => $args{'ignore_errors'},
@@ -328,14 +327,16 @@
sub localize {
my($me) = @_;
- my $gpath = $me->{'gpath'};
+ my $pmpath;
- require Grid::GPT::FilelistFunctions;
- Grid::GPT::FilelistFunctions::mkinstalldir("$gpath/var/lib/perl/Grid/GPT/");
+ foreach my $dir (@INC) {
+ next unless ( -e "$dir/Grid/GPT/LocalEnv.pm.in" );
+ $pmpath = $dir;
+ last;
+ }
- open INFILE, "$gpath/lib/perl/Grid/GPT/LocalEnv.pm.in";
- open OUTFILE, ">$gpath/var/lib/perl/Grid/GPT/LocalEnv.pm";
- my $link = ">$gpath/var/lib/perl/Grid/GPT/LocalEnv.pm";
+ open INFILE, "$pmpath/Grid/GPT/LocalEnv.pm.in";
+ open OUTFILE, ">$pmpath/Grid/GPT/LocalEnv.pm";
for my $l (<INFILE>) {
while (my ($n,$v) = each(%{$me->{'substitutions'}})) {
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt/Archive.pm gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt/Archive.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm 2008-10-04 10:57:47.000000000 +0200
@@ -75,21 +75,6 @@
return if defined $gtar;
- my $gpath = $ENV{GPT_LOCATION};
-
- if (!defined($gpath))
- {
- $gpath = $ENV{GLOBUS_LOCATION};
- }
-
- if (!defined($gpath))
- {
- die "GPT_LOCATION or needs to be set before running this script";
- }
-
- # Add path to LocalEnv module to @INC
- push @INC,"$gpath/var/lib/perl";
-
die "ERROR: GPT is not configured. Use gpt-config\n"
if ! defined eval ("require Grid::GPT::LocalEnv;");
@@ -110,24 +95,6 @@
sub new {
my ($class, %arg) = @_;
-
-
-
- my $gpath = $ENV{GPT_LOCATION};
-
- if (!defined($gpath))
- {
- $gpath = $ENV{GLOBUS_LOCATION};
- }
-
- if (!defined($gpath))
- {
- die "GPT_LOCATION or needs to be set before running this script";
- }
-
- # Add path to LocalEnv module to @INC
- push @INC,"$gpath/var/lib/perl";
-
die "ERROR: GPT is not configured. Use gpt-config\n"
if ! defined eval ("require Grid::GPT::LocalEnv;");
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm gpt/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm 2006-03-16 19:27:23.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm 2008-10-04 10:57:47.000000000 +0200
@@ -21,21 +21,6 @@
# Preloaded methods go here.
sub find_make {
- my $gpath = $ENV{GPT_LOCATION};
-
- if (!defined($gpath))
- {
- $gpath = $ENV{GLOBUS_LOCATION};
- }
-
- if (!defined($gpath))
- {
- die "GPT_LOCATION or needs to be set before running this script";
- }
-
- # Add path to LocalEnv module to @INC
- push @INC,"$gpath/var/lib/perl";
-
die "ERROR: GPT is not configured. Use gpt-config\n"
if ! defined eval ("require Grid::GPT::LocalEnv;");
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm gpt/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm 2008-10-04 10:57:47.000000000 +0200
@@ -61,21 +61,6 @@
return if defined $gtar;
- my $gpath = $ENV{GPT_LOCATION};
-
- if (!defined($gpath))
- {
- $gpath = $ENV{GLOBUS_LOCATION};
- }
-
- if (!defined($gpath))
- {
- die "GPT_LOCATION or needs to be set before running this script";
- }
-
- # Add path to LocalEnv module to @INC
- push @INC,"$gpath/var/lib/perl";
-
die "ERROR: GPT is not configured. Use gpt-config\n"
if ! defined eval ("require Grid::GPT::LocalEnv;");
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt.pm gpt/packaging_tools/perl/GPT/PkgMngmt.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt.pm 2008-10-04 10:57:47.000000000 +0200
@@ -23,21 +23,6 @@
return $rpm if defined $rpm;
- my $gpath = $ENV{GPT_LOCATION};
-
- if (!defined($gpath))
- {
- $gpath = $ENV{GLOBUS_LOCATION};
- }
-
- if (!defined($gpath))
- {
- die "GPT_LOCATION or needs to be set before running this script";
- }
-
- # Add path to LocalEnv module to @INC
- push @INC,"$gpath/var/lib/perl";
-
die "ERROR: GPT is not configured. Use gpt-config\n"
if ! defined eval ("require Grid::GPT::LocalEnv;");
@@ -86,21 +71,6 @@
return if defined $gtar;
- my $gpath = $ENV{GPT_LOCATION};
-
- if (!defined($gpath))
- {
- $gpath = $ENV{GLOBUS_LOCATION};
- }
-
- if (!defined($gpath))
- {
- die "GPT_LOCATION or needs to be set before running this script";
- }
-
- # Add path to LocalEnv module to @INC
- push @INC,"$gpath/var/lib/perl";
-
die "ERROR: GPT is not configured. Use gpt-config\n"
if ! defined eval ("require Grid::GPT::LocalEnv;");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-bundle gpt/packaging_tools/perl/scripts/gpt-bundle
--- gpt.orig/packaging_tools/perl/scripts/gpt-bundle 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-bundle 2008-10-04 10:57:47.000000000 +0200
@@ -811,9 +811,6 @@
if (! defined $arch)
{
- # Add path to LocalEnv module to @INC
- push @INC,"$gpath/var/lib/perl";
-
die "ERROR: GPT is not configured. Use gpt-config\n"
if ! defined eval ("require Grid::GPT::LocalEnv;");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-config gpt/packaging_tools/perl/scripts/gpt-config
--- gpt.orig/packaging_tools/perl/scripts/gpt-config 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-config 2008-10-04 10:57:47.000000000 +0200
@@ -82,11 +82,6 @@
exit 0;
}
-# Add path to LocalEnv module to @INC
-
-push @INC,"$gpath/var/lib/perl";
-
-
if (defined $list) {
die "ERROR: GPT has not been configured\n"
if ! defined eval "require Grid::GPT::LocalEnv;";
grid-packaging-tools-share.patch:
--- NEW FILE grid-packaging-tools-share.patch ---
diff -ur gpt.orig/packaging_tools/amdir/pkgdata_Makefile.am gpt/packaging_tools/amdir/pkgdata_Makefile.am
--- gpt.orig/packaging_tools/amdir/pkgdata_Makefile.am 2006-07-26 21:16:59.000000000 +0200
+++ gpt/packaging_tools/amdir/pkgdata_Makefile.am 2008-12-15 08:33:05.000000000 +0100
@@ -1,6 +1,6 @@
include $(top_srcdir)/globus_automake_pre
-flavordir = $(GLOBUS_LOCATION)/etc/$(PACKAGE)
+flavordir = $(datadir)/globus/flavors
FILELIST_FILES = noflavor_data.filelist \
$(GLOBUS_FLAVOR_NAME)_dev.filelist \
diff -ur gpt.orig/packaging_tools/configure gpt/packaging_tools/configure
--- gpt.orig/packaging_tools/configure 2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/configure 2008-12-15 08:33:05.000000000 +0100
@@ -273,7 +273,7 @@
PACKAGE_BUGREPORT=''
ac_unique_file="Makefile.am"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S GPT_LOCATION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S GPT_LOCATION ENABLE_COMPAT_TRUE ENABLE_COMPAT_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -793,6 +793,11 @@
esac
cat <<\_ACEOF
+Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-compat disable backward compatibility symlinks
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -2033,6 +2038,26 @@
+# Check whether --enable-compat was given.
+if test "${enable_compat+set}" = set; then
+ enableval=$enable_compat;
+else
+ enable_compat="yes"
+fi
+
+{ echo "$as_me:$LINENO: Enable backward compatibility symlinks: $enable_compat" >&5
+echo "$as_me: Enable backward compatibility symlinks: $enable_compat" >&6;}
+
+
+if test "x$enable_compat" = "xyes"; then
+ ENABLE_COMPAT_TRUE=
+ ENABLE_COMPAT_FALSE='#'
+else
+ ENABLE_COMPAT_TRUE='#'
+ ENABLE_COMPAT_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile perl/scripts/gpt_version perl/GPT/GPTIdentity.pm"
cat >confcache <<\_ACEOF
@@ -2157,6 +2182,13 @@
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${ENABLE_COMPAT_TRUE}" && test -z "${ENABLE_COMPAT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COMPAT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ENABLE_COMPAT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -2711,6 +2743,8 @@
s, at GZIP@,$GZIP,;t t
s, at LN_S@,$LN_S,;t t
s, at GPT_LOCATION@,$GPT_LOCATION,;t t
+s, at ENABLE_COMPAT_TRUE@,$ENABLE_COMPAT_TRUE,;t t
+s, at ENABLE_COMPAT_FALSE@,$ENABLE_COMPAT_FALSE,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
diff -ur gpt.orig/packaging_tools/configure.ac gpt/packaging_tools/configure.ac
--- gpt.orig/packaging_tools/configure.ac 2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/configure.ac 2008-12-15 08:33:05.000000000 +0100
@@ -85,6 +85,10 @@
AC_SUBST(GPT_LOCATION)
+AC_ARG_ENABLE(compat, AC_HELP_STRING([--disable-compat], [disable backward compatibility symlinks]),[],enable_compat="yes")
+AC_MSG_NOTICE([Enable backward compatibility symlinks: $enable_compat])
+AM_CONDITIONAL([ENABLE_COMPAT],[test "x$enable_compat" = "xyes"])
+
AC_CONFIG_FILES(Makefile
perl/scripts/gpt_version
perl/GPT/GPTIdentity.pm
diff -ur gpt.orig/packaging_tools/etc/gpt-bootstrap.sh gpt/packaging_tools/etc/gpt-bootstrap.sh
--- gpt.orig/packaging_tools/etc/gpt-bootstrap.sh 2008-01-25 21:33:21.000000000 +0100
+++ gpt/packaging_tools/etc/gpt-bootstrap.sh 2008-12-15 08:43:01.000000000 +0100
@@ -9,7 +9,7 @@
# Removed check for autotools. CAB 01/08
# Always include globus macros
-config="$aclocal_includes -I $GLOBUS_LOCATION/share/globus_aclocal"
+config="$aclocal_includes -I $GLOBUS_LOCATION/share/globus/aclocal"
# test for local macros
if test -d "./config"; then
@@ -17,13 +17,13 @@
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 ! -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
else
- config="$config -I $GPT_LOCATION/share/gpt/aclocal"
+ config="$config -I $GPT_LOCATION/share/globus/aclocal"
fi
fi
@@ -33,7 +33,7 @@
if test ! -h pkgdata/Makefile.am ; then
echo "installing Makefile.am in the pkgdata directory"
- ln -s $GPT_LOCATION/share/gpt/amdir/pkgdata_Makefile.am \
+ ln -s $GPT_LOCATION/share/globus/amdir/pkgdata_Makefile.am \
pkgdata/Makefile.am
fi
diff -ur gpt.orig/packaging_tools/etc/gpt_rpm.spec gpt/packaging_tools/etc/gpt_rpm.spec
--- gpt.orig/packaging_tools/etc/gpt_rpm.spec 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/etc/gpt_rpm.spec 2008-12-15 08:33:05.000000000 +0100
@@ -31,7 +31,7 @@
%build
GPT_INSTALL_LOCATION=${RPM_BUILD_ROOT}GPT_PREFIX_GPT; export GPT_INSTALL_LOCATION; $GPT_LOCATION/sbin/gpt-install --force ${RPM_SOURCE_DIR}/GPT_BIN_PKG_NAME_GPT
-rm -f ${RPM_BUILD_ROOT}GPT_PREFIX_GPT/etc/gpt/packages/GPT_NAME_GPT/GPT_FLAVOR_GPTGPT_PKGTYPE_GPT.format
+rm -f ${RPM_BUILD_ROOT}GPT_PREFIX_GPT/share/globus/packages/GPT_NAME_GPT/GPT_FLAVOR_GPTGPT_PKGTYPE_GPT.format
#########################################################################
diff -ur gpt.orig/packaging_tools/Makefile.am gpt/packaging_tools/Makefile.am
--- gpt.orig/packaging_tools/Makefile.am 2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/Makefile.am 2008-12-15 08:38:27.000000000 +0100
@@ -31,11 +31,11 @@
perl/scripts/gpt_version
-gptdatadir = ${prefix}/etc/gpt
+gptdatadir = $(datadir)/globus
gptdata_DATA = gpt_scripts_list
-gptexecsharedir = ${prefix}/share/gpt
+gptexecsharedir = $(datadir)/globus
gptexecshare_SCRIPTS = config.guess
@@ -128,7 +128,7 @@
perl/GPT/PackageFilelist/xml1/ListInterface.pm
-amdirdir = $(datadir)/gpt/amdir
+amdirdir = $(datadir)/globus/amdir
amdir_DATA = \
amdir/data.am \
@@ -143,9 +143,9 @@
amdir/pkgdata_Makefile.am
-pkg_confdir = $(sysconfdir)/gpt
-dtddir = $(sysconfdir)/gpt/dtd
-aclocaldir = $(datadir)/gpt/aclocal
+pkg_confdir = $(datadir)/globus
+dtddir = $(datadir)/globus/dtd
+aclocaldir = $(datadir)/globus/aclocal
pkg_conf_DATA = \
etc/globus_flavor_labels.conf \
@@ -171,7 +171,11 @@
etc/gpt-bootstrap.sh
install-man: install-pod2man
+if ENABLE_COMPAT
install-data-hook: install-localize hack-for-globus-core
+else
+install-data-hook: install-localize
+endif
install-localize:
@echo "Localizing scripts to $(PERL)"
@@ -197,13 +201,13 @@
@if test ! -h $(datadir)/globus_aclocal; then \
startdir=`pwd`; \
cd $(datadir); \
- $(LN_S) gpt/aclocal globus_aclocal; \
+ $(LN_S) globus/aclocal globus_aclocal; \
cd $$startdir; \
fi; \
if test ! -h $(datadir)/gpt_amdir; then \
startdir=`pwd`; \
cd $(datadir); \
- $(LN_S) gpt/amdir gpt_amdir; \
+ $(LN_S) globus/amdir gpt_amdir; \
cd $$startdir; \
fi
diff -ur gpt.orig/packaging_tools/Makefile.in gpt/packaging_tools/Makefile.in
--- gpt.orig/packaging_tools/Makefile.in 2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/Makefile.in 2008-12-15 08:37:36.000000000 +0100
@@ -49,6 +49,8 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ENABLE_COMPAT_FALSE = @ENABLE_COMPAT_FALSE@
+ENABLE_COMPAT_TRUE = @ENABLE_COMPAT_TRUE@
GPT_LOCATION = @GPT_LOCATION@
GUNZIP = @GUNZIP@
GZIP = @GZIP@
@@ -141,11 +143,11 @@
perl/scripts/gpt_version
-gptdatadir = ${prefix}/etc/gpt
+gptdatadir = $(datadir)/globus
gptdata_DATA = gpt_scripts_list
-gptexecsharedir = ${prefix}/share/gpt
+gptexecsharedir = $(datadir)/globus
gptexecshare_SCRIPTS = config.guess
@@ -241,7 +243,7 @@
perl/GPT/PackageFilelist/xml1/ListInterface.pm
-amdirdir = $(datadir)/gpt/amdir
+amdirdir = $(datadir)/globus/amdir
amdir_DATA = \
amdir/data.am \
@@ -256,9 +258,9 @@
amdir/pkgdata_Makefile.am
-pkg_confdir = $(sysconfdir)/gpt
-dtddir = $(sysconfdir)/gpt/dtd
-aclocaldir = $(datadir)/gpt/aclocal
+pkg_confdir = $(datadir)/globus
+dtddir = $(datadir)/globus/dtd
+aclocaldir = $(datadir)/globus/aclocal
pkg_conf_DATA = \
etc/globus_flavor_labels.conf \
@@ -837,7 +839,8 @@
install-man: install-pod2man
-install-data-hook: install-localize hack-for-globus-core
+ at ENABLE_COMPAT_TRUE@install-data-hook: install-localize hack-for-globus-core
+ at ENABLE_COMPAT_FALSE@install-data-hook: install-localize
install-localize:
@echo "Localizing scripts to $(PERL)"
@@ -863,13 +866,13 @@
@if test ! -h $(datadir)/globus_aclocal; then \
startdir=`pwd`; \
cd $(datadir); \
- $(LN_S) gpt/aclocal globus_aclocal; \
+ $(LN_S) globus/aclocal globus_aclocal; \
cd $$startdir; \
fi; \
if test ! -h $(datadir)/gpt_amdir; then \
startdir=`pwd`; \
cd $(datadir); \
- $(LN_S) gpt/amdir gpt_amdir; \
+ $(LN_S) globus/amdir gpt_amdir; \
cd $$startdir; \
fi
diff -ur gpt.orig/packaging_tools/perl/GPT/Algorithms.pm gpt/packaging_tools/perl/GPT/Algorithms.pm
--- gpt.orig/packaging_tools/perl/GPT/Algorithms.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Algorithms.pm 2008-12-15 08:33:05.000000000 +0100
@@ -1188,9 +1188,9 @@
return "SRC_2xBUNDLE";
}
+ return "BIN_PKG" if grep { m!share/globus/packages! } @contents;
return "BIN_PKG" if grep { m!etc/gpt/packages! } @contents;
return "BIN_PKG" if grep { m!etc/globus_packages! } @contents;
-## return "BIN_PKG" if grep { m!etc/gpt/packages! } @contents;
return "SRC_PKG" if grep { m!pkgdata! } @contents;
return "SRC_PKG" if grep { m!pkg_data_src.gpt! } @contents;
diff -ur gpt.orig/packaging_tools/perl/GPT/FilelistFunctions.pm gpt/packaging_tools/perl/GPT/FilelistFunctions.pm
--- gpt.orig/packaging_tools/perl/GPT/FilelistFunctions.pm 2007-08-08 01:07:51.000000000 +0200
+++ gpt/packaging_tools/perl/GPT/FilelistFunctions.pm 2008-12-15 08:33:05.000000000 +0100
@@ -81,6 +81,7 @@
#check for the existance of packaging data files
for my $pkgtype (@Grid::GPT::V1::Definitions::package_types) {
my $pkgdatadir = "$me->{'locations'}->{'pkgdir'}/$name";
+ my $oldpkgdatadir = "$me->{'locations'}->{'oldpkgdir'}/$name";
my $altpkgdatadir = "$me->{'locations'}->{'altpkgdir'}/$name";
my ($filelistname, $pkgdataname) =
("$ {flavor}_$ {pkgtype}.filelist",
@@ -92,12 +93,18 @@
$filelistname = "$pkgdatadir/$filelistname"
if -f "$pkgdatadir/$filelistname";
+ $filelistname = "$oldpkgdatadir/$filelistname"
+ if -f "$oldpkgdatadir/$filelistname";
+
$filelistname = "$altpkgdatadir/$filelistname"
if -f "$altpkgdatadir/$filelistname";
$pkgdataname = "$pkgdatadir/$pkgdataname"
if -f "$pkgdatadir/$pkgdataname";
+ $pkgdataname = "$oldpkgdatadir/$pkgdataname"
+ if -f "oldpkgdatadir/$pkgdataname";
+
$pkgdataname = "$altpkgdatadir/$pkgdataname"
if -f "$altpkgdatadir/$pkgdataname";
@@ -108,12 +115,16 @@
my $pkgdatasubdir = $pkgdatadir;
$pkgdatasubdir =~ s!$installdir/!!;
+ my $oldpkgdatasubdir = $oldpkgdatadir;
+ $oldpkgdatasubdir =~ s!$installdir/!!;
+
my $altpkgdatasubdir = $altpkgdatadir;
$altpkgdatasubdir =~ s!$installdir/!!;
my @notpkgdata;
@notpkgdata = grep { ! m!$pkgdatasubdir!}
+ grep { ! m!$oldpkgdatasubdir!}
grep { ! m!$altpkgdatasubdir!} @$list if defined $list;
#remove empty packages
@@ -671,7 +682,9 @@
for my $f (@$filelist) {
my ($dir, $name) = $f =~ m!(.+)/([^/]+)$!;
- next if $dir =~ m!/etc/\w+packages!;
+ next if $dir =~ m!/share/globus/packages!;
+ next if $dir =~ m!/etc/gpt/packages!;
+ next if $dir =~ m!/etc/globus_packages!;
$dir = "$installdir/$dir";
diff -ur gpt.orig/packaging_tools/perl/GPT/Filelist.pm gpt/packaging_tools/perl/GPT/Filelist.pm
--- gpt.orig/packaging_tools/perl/GPT/Filelist.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Filelist.pm 2008-12-15 08:33:05.000000000 +0100
@@ -59,13 +59,11 @@
sub reset {
my $self = shift;
$self->{'list'} = [];
-## @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/globus_packages/! }
-
- @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/gpt/packages/! }
+ @{$self->{'list'}} = grep { $_->{'dir'} !~ m!share/globus/packages/! }
+ grep { $_->{'dir'} !~ m!etc/gpt/packages/! }
grep { $_->{'dir'} !~ m!etc/globus_packages/! }
@{$self->{'fulllist'}};
-
# need to leave this because of bug that leaves noinst files in the root dir.
@{$self->{'list'}} = grep { $_->{'dir'} =~ m!\w+!
or $_->{'name'} =~ m!\.xml!
@@ -228,8 +226,7 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
-## if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/globus_packages)(?:/|$)!) {
- if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/gpt/packages)(?:/|$)!) {
+ if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|share/globus/packages)(?:/|$)!) {
push @newlist, $_;
}
}
diff -ur gpt.orig/packaging_tools/perl/GPT/FilelistSort.pm gpt/packaging_tools/perl/GPT/FilelistSort.pm
--- gpt.orig/packaging_tools/perl/GPT/FilelistSort.pm 2008-04-07 18:33:10.000000000 +0200
+++ gpt/packaging_tools/perl/GPT/FilelistSort.pm 2008-12-15 08:33:05.000000000 +0100
@@ -56,8 +56,8 @@
sub reset {
my $self = shift;
$self->{'list'} = [];
-## @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/globus_packages/! }
- @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/gpt/packages/! }
+ @{$self->{'list'}} = grep { $_->{'dir'} !~ m!share/globus/packages/! }
+ grep { $_->{'dir'} !~ m!etc/gpt/packages/! }
grep { $_->{'dir'} !~ m!etc/globus_packages/! }
@{$self->{'fulllist'}};
@@ -225,8 +225,7 @@
my $list = $self->{'list'};
my @newlist;
for (@{$list}) {
-## if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/globus_packages)(?:/|$)!) {
- if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/gpt/packages)(?:/|$)!) {
+ if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|share/globus/packages)(?:/|$)!) {
push @newlist, $_;
}
}
diff -ur gpt.orig/packaging_tools/perl/GPT/Installation.pm gpt/packaging_tools/perl/GPT/Installation.pm
--- gpt.orig/packaging_tools/perl/GPT/Installation.pm 2006-01-11 17:56:48.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Installation.pm 2008-12-15 08:45:47.000000000 +0100
@@ -74,8 +74,7 @@
# Check to see if version checking is disabled for this location.
my $gptdir = $me->{'locations'}->{'pkgdir'};
- $gptdir =~ s!globus_packages!gpt!;
-## $gptdir =~ s!gpt/packages!gpt!;
+ $gptdir =~ s!globus/packages!globus!;
$me->{'disable_version_checking'} = 1
if -e "$gptdir/disable_version_checking"
diff -ur gpt.orig/packaging_tools/perl/GPT/Localize.pm gpt/packaging_tools/perl/GPT/Localize.pm
--- gpt.orig/packaging_tools/perl/GPT/Localize.pm 2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Localize.pm 2008-12-15 08:43:33.000000000 +0100
@@ -16,7 +16,7 @@
sub get_target {
my $gpath = shift;
return $target if defined $target;
- $target = `$gpath/share/gpt/config.guess`;
+ $target = `$gpath/share/globus/config.guess`;
chomp($target);
return $target;
}
diff -ur gpt.orig/packaging_tools/perl/GPT/Locations.pm gpt/packaging_tools/perl/GPT/Locations.pm
--- gpt.orig/packaging_tools/perl/GPT/Locations.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Locations.pm 2008-12-15 08:40:31.000000000 +0100
@@ -30,6 +30,7 @@
gpt_amdir => undef,
gpt_aclocaldir => undef,
pkgdir => undef,
+ oldpkgdir => undef,
altpkgdir => undef,
bundledir => undef,
setupdir => undef,
@@ -65,9 +66,9 @@
sub _init_gptdir {
my ($me) =@_;
my $gptdir = $ENV{'GPT_LOCATION'};
- $me->{'gpt_etcdir'} = "$gptdir/etc/gpt";
- $me->{'gpt_amdir'} = "$gptdir/share/gpt/amdir";
- $me->{'gpt_aclocaldir'} = "$gptdir/share/gpt/aclocal";
+ $me->{'gpt_etcdir'} = "$gptdir/share/globus";
+ $me->{'gpt_amdir'} = "$gptdir/share/globus/amdir";
+ $me->{'gpt_aclocaldir'} = "$gptdir/share/globus/aclocal";
}
sub _init_tmpdir {
@@ -87,10 +88,22 @@
if ($args{'mode'} eq 'install' ) {
Grid::GPT::FilelistFunctions::mkinstalldir($me->{'bundledir'});
Grid::GPT::FilelistFunctions::mkinstalldir($me->{'setupdir'});
- my $startdir = cwd();
- chdir "$me->{'installdir'}/etc";
- my $result = `ln -s gpt/packages globus_packages`
- if ! -d "globus_packages";
+ my $amdir = $me->{'gpt_amdir'};
+ $amdir =~ s!globus/amdir!gpt_amdir!;
+ if (-d "$amdir") {
+ Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/etc/gpt");
+ Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/share/globus/aclocal");
+ Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/share/globus/flavors");
+ my $result;
+ $result = `ln -s ../../share/globus/packages $me->{'oldpkgdir'}`
+ if ! -d "$me->{'oldpkgdir'}";
+ $result = `ln -s ../share/globus/packages $me->{'altpkgdir'}`
+ if ! -d "$me->{'altpkgdir'}";
+ $result = `ln -s globus/aclocal $me->{'installdir'}/share/globus_aclocal`
+ if ! -d "$me->{'installdir'}/share/globus_aclocal";
+ $result = `ln -s ../share/globus/flavors $me->{'installdir'}/etc/globus_core`
+ if ! -d "$me->{'installdir'}/etc/globus_core";
+ }
return
}
if ($args{'mode'} eq 'build' ) {
@@ -133,16 +146,13 @@
# Determine what kind of package directory we have
- my ($altpkgdir, $pkgdir) = ("etc/globus_packages", "etc/gpt/packages");
+ my ($pkgdir, $oldpkgdir, $altpkgdir) = ("share/globus/packages",
+ "etc/gpt/packages",
+ "etc/globus_packages");
- if (-d "$me->{'installdir'}/etc/globus_packages" and
- ! -d "$me->{'installdir'}/etc/gpt/packages") {
- $pkgdir = "etc/globus_packages";
- $altpkgdir = "etc/gpt/packages";
- }
-
- $me->{'bundledir'} = "$me->{'installdir'}/etc/gpt/bundles";
+ $me->{'bundledir'} = "$me->{'installdir'}/share/globus/bundles";
$me->{'pkgdir'} = "$me->{'installdir'}/$pkgdir";
+ $me->{'oldpkgdir'} = "$me->{'installdir'}/$oldpkgdir";
$me->{'altpkgdir'} = "$me->{'installdir'}/$altpkgdir";
$me->{'setupdir'} = "$me->{'installdir'}/$pkgdir/setup";
}
diff -ur gpt.orig/packaging_tools/perl/GPT/PackageFilelist/flat1.pm gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm
--- gpt.orig/packaging_tools/perl/GPT/PackageFilelist/flat1.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm 2008-12-15 08:33:05.000000000 +0100
@@ -116,7 +116,7 @@
$flavor = $pkginfo->flavor();
$pkgtype = $pkginfo->pkgtype();
- my $tmpPath = "etc/globus_packages/" . $name . "/" . $flavor . "_" . $pkgtype . ".filelist";
+ my $tmpPath = "share/globus/packages/" . $name . "/" . $flavor . "_" . $pkgtype . ".filelist";
$self->setFilelist( read => $tmpPath );
}
diff -ur gpt.orig/packaging_tools/perl/GPT/PackageFilelist/xml1.pm gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm
--- gpt.orig/packaging_tools/perl/GPT/PackageFilelist/xml1.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm 2008-12-15 08:33:05.000000000 +0100
@@ -116,7 +116,7 @@
$flavor = $pkginfo->flavor();
$pkgtype = $pkginfo->pkgtype();
- my $tmpPath = "etc/globus_packages/" . $name . "/" . $flavor . "_" . $pkgtype . "_filelist.xml";
+ my $tmpPath = "share/globus/packages/" . $name . "/" . $flavor . "_" . $pkgtype . "_filelist.xml";
$self->setFilelist( read => $tmpPath, write => $tmpPath );
}
diff -ur gpt.orig/packaging_tools/perl/GPT/PackageFilelist.pm gpt/packaging_tools/perl/GPT/PackageFilelist.pm
--- gpt.orig/packaging_tools/perl/GPT/PackageFilelist.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PackageFilelist.pm 2008-12-15 08:33:05.000000000 +0100
@@ -435,8 +435,7 @@
return undef;
}
- my $str = "etc/globus_packages/"
-## my $str = "etc/gpt/packages/"
+ my $str = "share/globus/packages/"
. $self->getPkgInfo()->pkgname()
. "/pkg_data_"
. $self->getPkgInfo()->flavor()
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgDist.pm gpt/packaging_tools/perl/GPT/PkgDist.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgDist.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgDist.pm 2008-12-15 08:33:05.000000000 +0100
@@ -162,6 +162,7 @@
return undef;
}
+ return $f if $f =~ m!share/globus/packages!;
return $f if $f =~ m!etc/gpt/packages!;
return $f if $f =~ m!etc/globus_packages!;
return undef;
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgFileName.pm gpt/packaging_tools/perl/GPT/PkgFileName.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgFileName.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgFileName.pm 2008-12-15 08:33:05.000000000 +0100
@@ -32,7 +32,8 @@
my $coreflavors = new Grid::GPT::V1::BuildFlavors(core =>1);
push @{$me->{'flavors'}}, @{$coreflavors->{'flavors'}};
- if (-d "$me->{'locations'}->{'installdir'}/etc/globus_core") {
+ if (-d "$me->{'locations'}->{'installdir'}/share/globus/flavors" or
+ -d "$me->{'locations'}->{'installdir'}/etc/globus_core") {
my $installedflavors = new Grid::GPT::V1::BuildFlavors(installed => 1,
locations =>
$me->{'locations'});
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt/Archive.pm gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt/Archive.pm 2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm 2008-12-15 08:33:05.000000000 +0100
@@ -310,7 +310,8 @@
for my $f (@$rawfilelist) {
$f =~ s!^/+!!;
- $f =~ s!etc/globus_packages/!etc/gpt/packages/!;
+ $f =~ s!etc/gpt/packages/!share/globus/packages/!;
+ $f =~ s!etc/globus_packages/!share/globus/packages/!;
push @filelist, $f;
}
@@ -380,7 +381,8 @@
my $rawfilelist = $filelist;
$filelist = [];
for my $f (@$rawfilelist) {
- $f =~ s!etc/globus_packages/!etc/gpt/packages/!;
+ $f =~ s!etc/gpt/packages/!share/globus/packages/!;
+ $f =~ s!etc/globus_packages/!share/globus/packages/!;
push @$filelist, $f;
}
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm 2006-01-11 17:56:49.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm 2008-12-15 08:33:05.000000000 +0100
@@ -32,7 +32,7 @@
{
die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
}
- $environment{'core_src'} = "$gpath/etc/gpt";
+ $environment{'core_src'} = "$gpath/share/globus";
$environment{'core_src'} .= "/globus_core-src.tar.gz";
diff -ur gpt.orig/packaging_tools/perl/GPT/Setup.pm gpt/packaging_tools/perl/GPT/Setup.pm
--- gpt.orig/packaging_tools/perl/GPT/Setup.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Setup.pm 2008-12-15 08:33:05.000000000 +0100
@@ -135,7 +135,7 @@
=item finish
Writes metatdata into
-$GLOBUS_LOCATION/etc/globus_packages/setup/<setup_format_name> to
+$GLOBUS_LOCATION/share/globus/packages/setup/<setup_format_name> to
indicate that the setup is complete.
=head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/GPT/V1/BuildFlavors.pm gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm
--- gpt.orig/packaging_tools/perl/GPT/V1/BuildFlavors.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm 2008-12-15 08:33:05.000000000 +0100
@@ -32,7 +32,7 @@
{
$gpath = $ENV{GLOBUS_LOCATION};
}
- my $confdir = "$gpath/etc/gpt";
+ my $confdir = "$gpath/share/globus";
if (defined $args{'core'}) {
@@ -63,7 +63,22 @@
$me->{'flavors'} = [];
- if (-d "$gpath/etc/globus_core") {
+ if (-d "$gpath/share/globus/flavors") {
+ opendir(CONFDIR, "$gpath/share/globus/flavors")
+ || die "ERROR:BuildFlavors: $gpath/share/globus/flavors cannot be accessed\n";
+
+ my @flavorfiles = grep {m!flavor_\w+.gpt!} readdir(CONFDIR);
+
+ closedir(CONFDIR);
+ for my $ff (@flavorfiles) {
+ my $obj =
+ new Grid::GPT::V1::FlavorDefinition(xmlfile =>
+ "$gpath/share/globus/flavors/$ff");
+ $me->{$obj->{'name'}} = $obj;
+ push @{$me->{'flavors'}}, $obj->{'name'};
+ }
+ }
+ elsif (-d "$gpath/etc/globus_core") {
opendir(CONFDIR, "$gpath/etc/globus_core")
|| die "ERROR:BuildFlavors: $gpath/etc/globus_core cannot be accessed\n";
@@ -79,7 +94,7 @@
}
}
}
-##print Dumper $me;
+
return $me;
}
diff -ur gpt.orig/packaging_tools/perl/GPT/V1/Bundle.pm gpt/packaging_tools/perl/GPT/V1/Bundle.pm
--- gpt.orig/packaging_tools/perl/GPT/V1/Bundle.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/V1/Bundle.pm 2008-12-15 08:33:05.000000000 +0100
@@ -849,7 +849,7 @@
my $self = shift;
my $globusdir = shift;
- my $bndlDir = "$globusdir/etc/gpt/bundles/$self->{'Name'}";
+ my $bndlDir = "$globusdir/share/globus/bundles/$self->{'Name'}";
if (!(-e "$bndlDir"))
{
@@ -879,7 +879,7 @@
my $globusdir = $args{'globusdir'};
my $file = $args{'file'};
- my $bndlDir = "$globusdir/etc/gpt/bundles/$file";
+ my $bndlDir = "$globusdir/share/globus/bundles/$file";
opendir(DIR, $bndlDir) || die "can't opendir $bndlDir: $!";
my @dots = grep { /$file\.gpt-bundle\.xml/ } readdir(DIR);
@@ -893,7 +893,7 @@
my $self = shift;
my $globusdir = shift;
- my $bndlDir = "$globusdir/etc/gpt/bundles/$self->{'Name'}";
+ my $bndlDir = "$globusdir/share/globus/bundles/$self->{'Name'}";
if( !defined($self->{'BundleFile'}) )
{
diff -ur gpt.orig/packaging_tools/perl/GPT/V1/Package.pm gpt/packaging_tools/perl/GPT/V1/Package.pm
--- gpt.orig/packaging_tools/perl/GPT/V1/Package.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/V1/Package.pm 2008-12-15 08:33:05.000000000 +0100
@@ -84,7 +84,7 @@
{
my ($self, $name, $f, $t)=@_;
my $globus=$ENV{GLOBUS_LOCATION};
- my $path="$globus/etc/globus_packages/$name/pkg_data_".$f."_$t.gpt";
+ my $path="$globus/share/globus/packages/$name/pkg_data_".$f."_$t.gpt";
$self->read_metadata_file($path);
}
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-build gpt/packaging_tools/perl/scripts/gpt-build
--- gpt.orig/packaging_tools/perl/scripts/gpt-build 2006-01-11 17:56:50.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-build 2008-12-15 08:33:05.000000000 +0100
@@ -227,8 +227,8 @@
}
if (defined $disable_version_checking) {
- Grid::GPT::FilelistFunctions::mkinstalldir("$installdir/etc/gpt");
- my $result = system("touch $installdir/etc/gpt/disable_version_checking")
+ Grid::GPT::FilelistFunctions::mkinstalldir("$installdir/share/globus");
+ my $result = system("touch $installdir/share/globus/disable_version_checking")
}
# Scan source objects for globus_core
@@ -718,7 +718,7 @@
=item B<-coresrc>
Use this version of globus_core source rather than the one found in
-$GLOBUS_LOCATION/etc/gpt/globus_core-src.tar.gz.
+$GPT_LOCATION/share/globus/globus_core-src.tar.gz.
=item B<-disable-version-checking>
@@ -729,13 +729,13 @@
used, the version checking is disabled B<permanently> for the
installation pointed to by $GLOBUS_LOCATION. This condition can only
be removed by deleting the file
-$GLOBUS_LOCATION/etc/gpt/disable_version_checking.
+$GLOBUS_LOCATION/share/globus/disable_version_checking.
=item B<-flavor-cfg=FILE>
Use the flavor configurations found in FILE. The default
configuration file is
-$GLOBUS_LOCATION/etc/gpt/globus_flavor_labels.conf
+$GPT_LOCATION/share/globus/globus_flavor_labels.conf
=item B<-logdir=DIRECTORY>
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-bundle gpt/packaging_tools/perl/scripts/gpt-bundle
--- gpt.orig/packaging_tools/perl/scripts/gpt-bundle 2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-bundle 2008-12-15 08:33:05.000000000 +0100
@@ -922,7 +922,7 @@
collection of source packages. These bundles can then distributed be
installed using I<gpt-install> or I<gpt-build>. A bundle consists of a
collection of packages and a XML formatted description file. The DTD
-for this file is found in I<$GPT_LOCATION/etc/gpt_bundle.dtd>.
+for this file is found in I<$GPT_LOCATION/share/dtd/gpt_bundle.dtd>.
The script accepts a list of packages from the command line or from an
inputed bundle description file. It expands this list to include all
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-config gpt/packaging_tools/perl/scripts/gpt-config
--- gpt.orig/packaging_tools/perl/scripts/gpt-config 2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-config 2008-12-15 08:33:05.000000000 +0100
@@ -153,7 +153,7 @@
sub modify_gpt_scripts {
- open LIST, "$gpath/etc/gpt/gpt_scripts_list";
+ open LIST, "$gpath/share/globus/gpt_scripts_list";
my $list = <LIST>;
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_create_automake_rules gpt/packaging_tools/perl/scripts/gpt_create_automake_rules
--- gpt.orig/packaging_tools/perl/scripts/gpt_create_automake_rules 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_create_automake_rules 2008-12-15 08:33:05.000000000 +0100
@@ -61,7 +61,7 @@
# target types defined by automake
my @target_types = ("PROGRAMS", "LTLIBRARIES", "LIBRARIES","SCRIPTS", "HEADERS","DATA", "MANS");
-my $amdir = "$gpath/share/gpt_amdir";
+my $amdir = "$gpath/share/globus/amdir";
my %excluded_dirs;
for my $p (@excludes) {
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-deps gpt/packaging_tools/perl/scripts/gpt-deps
--- gpt.orig/packaging_tools/perl/scripts/gpt-deps 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-deps 2008-12-15 08:46:56.000000000 +0100
@@ -40,9 +40,9 @@
die("$gpath does not appear to hold a valid GPT installation\n");
}
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
{
- die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+ die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
}
#
@@ -85,7 +85,7 @@
my $installation =
new Grid::GPT::Installation(
- pkgdir => "$globus_path/etc/globus_packages",
+ pkgdir => "$globus_path/share/globus/packages",
);
Pod::Usage::pod2usage(-verbose => 0,
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-filelist-convert gpt/packaging_tools/perl/scripts/gpt-filelist-convert
--- gpt.orig/packaging_tools/perl/scripts/gpt-filelist-convert 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-filelist-convert 2008-12-15 08:46:17.000000000 +0100
@@ -34,9 +34,9 @@
$gpath = $globus_path;
}
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
{
- die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+ die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
}
#
@@ -75,7 +75,7 @@
#
my $installation = new Grid::GPT::Installation(
- pkgdir => "$globus_path/etc/globus_packages",
+ pkgdir => "$globus_path/share/globus/packages",
with_filelists => 0,
);
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-filelist-copy gpt/packaging_tools/perl/scripts/gpt-filelist-copy
--- gpt.orig/packaging_tools/perl/scripts/gpt-filelist-copy 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-filelist-copy 2008-12-15 08:47:24.000000000 +0100
@@ -34,9 +34,9 @@
$gpath = $globus_path;
}
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
{
- die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+ die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
}
#
@@ -79,7 +79,7 @@
#
my $installation = new Grid::GPT::Installation(
- pkgdir => "$globus_path/etc/globus_packages",
+ pkgdir => "$globus_path/share/globus/packages",
with_filelists => 0,
);
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-file-remove gpt/packaging_tools/perl/scripts/gpt-file-remove
--- gpt.orig/packaging_tools/perl/scripts/gpt-file-remove 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-file-remove 2008-12-15 08:46:44.000000000 +0100
@@ -34,9 +34,9 @@
$gpath = $globus_path;
}
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
{
- die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+ die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
}
#
@@ -92,7 +92,7 @@
if ( ($action eq "both") or ($action eq "filelist") )
{
my $installation = new Grid::GPT::Installation(
- pkgdir => "$globus_path/etc/globus_packages",
+ pkgdir => "$globus_path/share/globus/packages",
with_filelists => 1,
);
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-flavor-configuration gpt/packaging_tools/perl/scripts/gpt-flavor-configuration
--- gpt.orig/packaging_tools/perl/scripts/gpt-flavor-configuration 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-flavor-configuration 2008-12-15 08:33:05.000000000 +0100
@@ -117,10 +117,9 @@
default is a list of installed flavors. If the B<-standard> or
B<-all> flags are used then the script permutes the flavor choices
listed in the flavor configuration file. The file
-$GPT_LOCATION/etc/globus_package_management/globus_flavor_labels.conf
+$GPT_LOCATION/share/globus/globus_flavor_labels.conf
is the default. The possible fields for a flavor are described in the
-file
-<cite>$GPT_LOCATION/etc/globus_package_management/globus_flavors.dtd</cite>
+file $GPT_LOCATION/share/globus/dtd/globus_flavors.dtd
=head1 OPTIONS
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-postinstall gpt/packaging_tools/perl/scripts/gpt-postinstall
--- gpt.orig/packaging_tools/perl/scripts/gpt-postinstall 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-postinstall 2008-12-15 08:47:11.000000000 +0100
@@ -41,9 +41,9 @@
$gpath = $globus_path;
}
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
{
- die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+ die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
}
@INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-setup gpt/packaging_tools/perl/scripts/gpt-setup
--- gpt.orig/packaging_tools/perl/scripts/gpt-setup 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-setup 2008-12-15 08:33:05.000000000 +0100
@@ -72,7 +72,7 @@
my $packagedizedir = $gpath;
-$packagedizedir .= '/share/globus_aclocal';
+$packagedizedir .= '/share/globus/aclocal';
# establish stuff to be ignored by packagedize
for (@{ ['CVS', 'RCS', 'pkgdata', 'doxygen'] }) {
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_sort_filelist gpt/packaging_tools/perl/scripts/gpt_sort_filelist
--- gpt.orig/packaging_tools/perl/scripts/gpt_sort_filelist 2006-01-12 00:05:17.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_sort_filelist 2008-12-15 08:33:05.000000000 +0100
@@ -116,6 +116,8 @@
# the filelists later.
my $pkgdatasubdir = "$locations->{'pkgdir'}";
$pkgdatasubdir =~ s!$prefix/!!;
+my $oldpkgdatasubdir = "$locations->{'oldpkgdir'}";
+$oldpkgdatasubdir =~ s!$prefix/!!;
my $altpkgdatasubdir = "$locations->{'altpkgdir'}";
$altpkgdatasubdir =~ s!$prefix/!!;
@@ -158,6 +160,7 @@
# If this filelist only has package metadata, don't write it!
my @notpkgdata;
@notpkgdata = grep { ! m!$pkgdatasubdir!}
+ grep { ! m!$oldpkgdatasubdir!}
grep { ! m!$altpkgdatasubdir!} @$outlines;
next if (! @notpkgdata );
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-verify gpt/packaging_tools/perl/scripts/gpt-verify
--- gpt.orig/packaging_tools/perl/scripts/gpt-verify 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-verify 2008-12-15 08:46:30.000000000 +0100
@@ -42,9 +42,9 @@
$gpath = $globus_path;
}
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
{
- die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+ die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
}
@INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
grid-packaging-tools-target.patch:
--- NEW FILE grid-packaging-tools-target.patch ---
diff -ur gpt.orig/packaging_tools/configure gpt/packaging_tools/configure
--- gpt.orig/packaging_tools/configure 2008-10-04 16:28:13.000000000 +0200
+++ gpt/packaging_tools/configure 2008-10-04 16:33:32.000000000 +0200
@@ -273,7 +273,7 @@
PACKAGE_BUGREPORT=''
ac_unique_file="Makefile.am"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S ENABLE_COMPAT_TRUE ENABLE_COMPAT_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S ENABLE_COMPAT_TRUE ENABLE_COMPAT_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1277,88 +1277,7 @@
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
- { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
- ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
- ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
- ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
am__api_version="1.7"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -1736,7 +1655,6 @@
-echo $target > ./etc/gpt/gnu_target
# Check whether --with-perl or --without-perl was given.
@@ -2692,18 +2610,6 @@
s, at ECHO_N@,$ECHO_N,;t t
s, at ECHO_T@,$ECHO_T,;t t
s, at LIBS@,$LIBS,;t t
-s, at build@,$build,;t t
-s, at build_cpu@,$build_cpu,;t t
-s, at build_vendor@,$build_vendor,;t t
-s, at build_os@,$build_os,;t t
-s, at host@,$host,;t t
-s, at host_cpu@,$host_cpu,;t t
-s, at host_vendor@,$host_vendor,;t t
-s, at host_os@,$host_os,;t t
-s, at target@,$target,;t t
-s, at target_cpu@,$target_cpu,;t t
-s, at target_vendor@,$target_vendor,;t t
-s, at target_os@,$target_os,;t t
s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s, at INSTALL_DATA@,$INSTALL_DATA,;t t
diff -ur gpt.orig/packaging_tools/configure.ac gpt/packaging_tools/configure.ac
--- gpt.orig/packaging_tools/configure.ac 2008-10-04 16:28:13.000000000 +0200
+++ gpt/packaging_tools/configure.ac 2008-10-04 16:31:10.000000000 +0200
@@ -1,10 +1,8 @@
AC_REVISION($Revision: 1.1.1.1 $)
AC_INIT(gpt, 3.2)
AC_CONFIG_SRCDIR(Makefile.am)
-AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([ no-installman ])
-echo $target > ./etc/gpt/gnu_target
AC_ARG_WITH([perl],
diff -ur gpt.orig/packaging_tools/Makefile.in gpt/packaging_tools/Makefile.in
--- gpt.orig/packaging_tools/Makefile.in 2008-10-04 16:28:18.000000000 +0200
+++ gpt/packaging_tools/Makefile.in 2008-10-04 16:34:21.000000000 +0200
@@ -35,9 +35,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
@@ -79,18 +76,10 @@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
bindir = @bindir@
-build = @build@
build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
@@ -105,11 +94,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
-target = @target@
target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
sbin_SCRIPTS = \
perl/scripts/gpt-build \
perl/scripts/gpt_build_config \
diff -ur gpt.orig/packaging_tools/perl/GPT/LocalEnv.pm.in gpt/packaging_tools/perl/GPT/LocalEnv.pm.in
--- gpt.orig/packaging_tools/perl/GPT/LocalEnv.pm.in 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/LocalEnv.pm.in 2008-10-04 16:31:10.000000000 +0200
@@ -41,7 +41,13 @@
}
-sub get_target {return "@target@"}
+sub get_target {
+ my $gpath = $ENV{'GPT_LOCATION'};
+ $gpath = '/usr' if ! defined $gpath;
+ require Grid::GPT::Localize;
+ return Grid::GPT::Localize::get_target($gpath);
+}
+
sub use_system_tar {return "@systar@"}
sub listconfig {
grid-packaging-tools-usr.patch:
--- NEW FILE grid-packaging-tools-usr.patch ---
diff -ur gpt.orig/packaging_tools/configure gpt/packaging_tools/configure
--- gpt.orig/packaging_tools/configure 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/configure 2008-12-15 08:54:57.000000000 +0100
@@ -273,7 +273,7 @@
PACKAGE_BUGREPORT=''
ac_unique_file="Makefile.am"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S GPT_LOCATION ENABLE_COMPAT_TRUE ENABLE_COMPAT_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S ENABLE_COMPAT_TRUE ENABLE_COMPAT_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1880,17 +1880,7 @@
# checking for the GPT_LOCATION
-
-if test "x$GPT_LOCATION" = "x"; then
- # checking for the GLOBUS_LOCATION
-
- if test "x$GLOBUS_LOCATION" = "x"; then
- echo "ERROR Please specify GLOBUS_LOCATION or GPT_LOCATION" >&2
- exit 1
- else
- GPT_LOCATION=$GLOBUS_LOCATION
- fi
-fi
+ac_default_prefix=${GPT_LOCATION:-$ac_default_prefix}
for ac_prog in gtar tar
do
@@ -2036,8 +2026,6 @@
fi
-
-
# Check whether --enable-compat was given.
if test "${enable_compat+set}" = set; then
enableval=$enable_compat;
@@ -2742,7 +2730,6 @@
s, at GUNZIP@,$GUNZIP,;t t
s, at GZIP@,$GZIP,;t t
s, at LN_S@,$LN_S,;t t
-s, at GPT_LOCATION@,$GPT_LOCATION,;t t
s, at ENABLE_COMPAT_TRUE@,$ENABLE_COMPAT_TRUE,;t t
s, at ENABLE_COMPAT_FALSE@,$ENABLE_COMPAT_FALSE,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
diff -ur gpt.orig/packaging_tools/configure.ac gpt/packaging_tools/configure.ac
--- gpt.orig/packaging_tools/configure.ac 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/configure.ac 2008-12-15 08:54:57.000000000 +0100
@@ -66,25 +66,13 @@
# checking for the GPT_LOCATION
-
-if test "x$GPT_LOCATION" = "x"; then
- # checking for the GLOBUS_LOCATION
-
- if test "x$GLOBUS_LOCATION" = "x"; then
- echo "ERROR Please specify GLOBUS_LOCATION or GPT_LOCATION" >&2
- exit 1
- else
- GPT_LOCATION=$GLOBUS_LOCATION
- fi
-fi
+ac_default_prefix=${GPT_LOCATION:-$ac_default_prefix}
AC_PATH_PROGS(TAR, gtar tar)
AC_PATH_PROGS(GUNZIP, gunzip)
AC_PATH_PROGS(GZIP, gzip)
AC_PROG_LN_S
-AC_SUBST(GPT_LOCATION)
-
AC_ARG_ENABLE(compat, AC_HELP_STRING([--disable-compat], [disable backward compatibility symlinks]),[],enable_compat="yes")
AC_MSG_NOTICE([Enable backward compatibility symlinks: $enable_compat])
AM_CONDITIONAL([ENABLE_COMPAT],[test "x$enable_compat" = "xyes"])
diff -ur gpt.orig/packaging_tools/etc/bootstrap.frg gpt/packaging_tools/etc/bootstrap.frg
--- gpt.orig/packaging_tools/etc/bootstrap.frg 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/etc/bootstrap.frg 2008-12-15 08:54:57.000000000 +0100
@@ -1,17 +1,12 @@
#! /bin/sh
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
- echo "ERROR Please specify GLOBUS_LOCATION" >&2
- exit 1
-fi
-
-if [ ! -f ${GLOBUS_LOCATION}/libexec/globus-bootstrap.sh ]; then
- echo "ERROR: Unable to locate \${GLOBUS_LOCATION}/libexec/globus-bootstrap.sh"
+if [ -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-bootstrap.sh ]; then
+ . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-bootstrap.sh
+elif [ -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-bootstrap.sh ]; then
+ . ${GLOBUS_LOCATION:-/usr}/libexec/globus-bootstrap.sh
+else
+ echo "ERROR: Unable to locate globus-bootstrap.sh"
echo " Please ensure that you have installed the globus-core package and"
echo " that GLOBUS_LOCATION is set to the proper directory"
exit
fi
-
-. ${GLOBUS_LOCATION}/libexec/globus-bootstrap.sh
diff -ur gpt.orig/packaging_tools/etc/gpt_autoconf_macros.m4 gpt/packaging_tools/etc/gpt_autoconf_macros.m4
--- gpt.orig/packaging_tools/etc/gpt_autoconf_macros.m4 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/etc/gpt_autoconf_macros.m4 2008-12-15 08:54:57.000000000 +0100
@@ -1,8 +1,7 @@
dnl GPT_INIT()
AC_DEFUN([GPT_INIT], [
if test "x$GPT_LOCATION" = "x"; then
- echo "ERROR Please specify GPT_LOCATION" >&2
- exit 1
+ GPT_LOCATION=/usr
fi
AC_SUBST(GPT_LOCATION)
@@ -73,9 +72,9 @@
. ./gpt_build_temp.sh
rm ./gpt_build_temp.sh
GPT_CFLAGS="$GPT_CONFIG_CFLAGS"
- GPT_INCLUDES="-I$GLOBUS_LOCATION/include/$GLOBUS_FLAVOR_NAME $GPT_CONFIG_INCLUDES"
+ GPT_INCLUDES="$GPT_CONFIG_INCLUDES"
GPT_LIBS="$GPT_CONFIG_PKG_LIBS $GPT_CONFIG_LIBS"
- GPT_LDFLAGS="$GPT_CONFIG_STATIC_LINKLINE -L$GLOBUS_LOCATION/lib $GPT_LDFLAGS"
+ GPT_LDFLAGS="$GPT_CONFIG_STATIC_LINKLINE $GPT_LDFLAGS"
GPT_PGM_LINKS="$GPT_CONFIG_PGM_LINKS $GPT_CONFIG_LIBS"
GPT_LIB_LINKS="$GPT_CONFIG_LIB_LINKS $GPT_CONFIG_LIBS"
diff -ur gpt.orig/packaging_tools/etc/gpt-bootstrap.sh gpt/packaging_tools/etc/gpt-bootstrap.sh
--- gpt.orig/packaging_tools/etc/gpt-bootstrap.sh 2008-12-15 08:43:01.000000000 +0100
+++ gpt/packaging_tools/etc/gpt-bootstrap.sh 2008-12-15 09:02:45.000000000 +0100
@@ -9,7 +9,7 @@
# Removed check for autotools. CAB 01/08
# Always include globus macros
-config="$aclocal_includes -I $GLOBUS_LOCATION/share/globus/aclocal"
+config="$aclocal_includes -I ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal"
# test for local macros
if test -d "./config"; then
@@ -17,18 +17,12 @@
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
- else
- config="$config -I $GPT_LOCATION/share/globus/aclocal"
- fi
+if test ! -f "${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/gpt_autoconf_macros.m4"; then
+ config="$config -I ${GPT_LOCATION:-/usr}/share/globus/aclocal"
fi
if test "x$GPT_LOCATION" = "x"; then
- GPT_LOCATION=$GLOBUS_LOCATION
+ GPT_LOCATION=/usr
fi
if test ! -h pkgdata/Makefile.am ; then
diff -ur gpt.orig/packaging_tools/Makefile.am gpt/packaging_tools/Makefile.am
--- gpt.orig/packaging_tools/Makefile.am 2008-12-15 08:38:27.000000000 +0100
+++ gpt/packaging_tools/Makefile.am 2008-12-15 08:54:57.000000000 +0100
@@ -1,5 +1,3 @@
-prefix=$(GPT_LOCATION)
-
sbin_SCRIPTS = \
perl/scripts/gpt-build \
perl/scripts/gpt_build_config \
diff -ur gpt.orig/packaging_tools/Makefile.in gpt/packaging_tools/Makefile.in
--- gpt.orig/packaging_tools/Makefile.in 2008-12-15 08:37:36.000000000 +0100
+++ gpt/packaging_tools/Makefile.in 2008-12-15 08:54:57.000000000 +0100
@@ -51,7 +51,6 @@
ECHO_T = @ECHO_T@
ENABLE_COMPAT_FALSE = @ENABLE_COMPAT_FALSE@
ENABLE_COMPAT_TRUE = @ENABLE_COMPAT_TRUE@
-GPT_LOCATION = @GPT_LOCATION@
GUNZIP = @GUNZIP@
GZIP = @GZIP@
INSTALL_DATA = @INSTALL_DATA@
@@ -101,7 +100,7 @@
mandir = @mandir@
oldincludedir = @oldincludedir@
perlmoduledir = @perlmoduledir@
-prefix = $(GPT_LOCATION)
+prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -111,7 +110,6 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-
sbin_SCRIPTS = \
perl/scripts/gpt-build \
perl/scripts/gpt_build_config \
diff -ur gpt.orig/packaging_tools/perl/GPT/BuildLine.pm gpt/packaging_tools/perl/GPT/BuildLine.pm
--- gpt.orig/packaging_tools/perl/GPT/BuildLine.pm 2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/BuildLine.pm 2008-12-15 08:54:57.000000000 +0100
@@ -33,7 +33,9 @@
if ($libname =~ m!$flavor! || $libname =~ m!GLOBUS_FLAVOR_NAME!)
{
- $libname =~ s/\-l/$ENV{GLOBUS_LOCATION}\/lib\/lib/;
+ my $globus_path = defined $ENV{GLOBUS_LOCATION} ?
+ $ENV{GLOBUS_LOCATION} : "/usr";
+ $libname =~ s/\-l/$globus_path\/lib\/lib/;
$libname = $libname.".a";
}
$libslist .= $libname;
diff -ur gpt.orig/packaging_tools/perl/GPT/Locations.pm gpt/packaging_tools/perl/GPT/Locations.pm
--- gpt.orig/packaging_tools/perl/GPT/Locations.pm 2008-12-15 08:40:31.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Locations.pm 2008-12-15 09:01:33.000000000 +0100
@@ -66,6 +66,7 @@
sub _init_gptdir {
my ($me) =@_;
my $gptdir = $ENV{'GPT_LOCATION'};
+ $gptdir = "/usr" if ( !defined $gptdir );
$me->{'gpt_etcdir'} = "$gptdir/share/globus";
$me->{'gpt_amdir'} = "$gptdir/share/globus/amdir";
$me->{'gpt_aclocaldir'} = "$gptdir/share/globus/aclocal";
@@ -134,7 +135,7 @@
my ($me) =@_;
my $gpath = $ENV{GPT_INSTALL_LOCATION} ? $ENV{GPT_INSTALL_LOCATION}
- : $ENV{GLOBUS_LOCATION};
+ : $ENV{GLOBUS_LOCATION} ? $ENV{GLOBUS_LOCATION} : "/usr";
$me->{'installdir'} = defined $me->{'installdir'} ?
diff -ur gpt.orig/packaging_tools/perl/GPT/PackageFilelist/flat1.pm gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm
--- gpt.orig/packaging_tools/perl/GPT/PackageFilelist/flat1.pm 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm 2008-12-15 08:54:57.000000000 +0100
@@ -69,7 +69,9 @@
# handle arguments
#
- my %args = (installdir => $ENV{'GLOBUS_LOCATION'}, @_);
+ my $globus_path = defined $ENV{'GLOBUS_LOCATION'} ?
+ $ENV{'GLOBUS_LOCATION'} : "/usr";
+ my %args = (installdir => $globus_path, @_);
my $installdir = $args{'installdir'};
my $packageList = $args{'packageList'};
diff -ur gpt.orig/packaging_tools/perl/GPT/PackageFilelist/xml1.pm gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm
--- gpt.orig/packaging_tools/perl/GPT/PackageFilelist/xml1.pm 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm 2008-12-15 08:54:57.000000000 +0100
@@ -69,7 +69,9 @@
# handle arguments
#
- my %args = (installdir => $ENV{'GLOBUS_LOCATION'}, @_);
+ my $globus_path = defined $ENV{'GLOBUS_LOCATION'} ?
+ $ENV{'GLOBUS_LOCATION'} : "/usr";
+ my %args = (installdir => $globus_path, @_);
my $installdir = $args{'installdir'};
my $packageList = $args{'packageList'};
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm 2008-12-15 08:54:57.000000000 +0100
@@ -24,8 +24,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/GPT/Setup.pm gpt/packaging_tools/perl/GPT/Setup.pm
--- gpt.orig/packaging_tools/perl/GPT/Setup.pm 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Setup.pm 2008-12-15 08:54:57.000000000 +0100
@@ -11,6 +11,7 @@
use Config;
# @INC fiddling
my $gpt_path = $ENV{GPT_LOCATION};
+$gpt_path = "/usr" if ( !defined $gpt_path );
@INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC);
require Grid::GPT::Installation;
diff -ur gpt.orig/packaging_tools/perl/GPT/V1/BuildFlavors.pm gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm
--- gpt.orig/packaging_tools/perl/GPT/V1/BuildFlavors.pm 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm 2008-12-15 08:54:57.000000000 +0100
@@ -30,7 +30,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
+ $gpath = "/usr";
}
my $confdir = "$gpath/share/globus";
diff -ur gpt.orig/packaging_tools/perl/GPT/V1/Package.pm gpt/packaging_tools/perl/GPT/V1/Package.pm
--- gpt.orig/packaging_tools/perl/GPT/V1/Package.pm 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/V1/Package.pm 2008-12-15 09:00:43.000000000 +0100
@@ -84,6 +84,7 @@
{
my ($self, $name, $f, $t)=@_;
my $globus=$ENV{GLOBUS_LOCATION};
+ $globus="/usr" if (!defined $globus);
my $path="$globus/share/globus/packages/$name/pkg_data_".$f."_$t.gpt";
$self->read_metadata_file($path);
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-build gpt/packaging_tools/perl/scripts/gpt-build
--- gpt.orig/packaging_tools/perl/scripts/gpt-build 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-build 2008-12-15 08:54:57.000000000 +0100
@@ -11,10 +11,6 @@
# programs.
#
-my $gp = $ENV{GPT_LOCATION};
-my @p = $ENV{PATH};
-my $pi = $ENV{PATH};
-
if ( ! ( defined eval "require 5.005" ) )
{
die "GPT requires at least Perl version 5.005";
@@ -24,7 +20,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_build_config gpt/packaging_tools/perl/scripts/gpt_build_config
--- gpt.orig/packaging_tools/perl/scripts/gpt_build_config 2006-01-11 17:56:50.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_build_config 2008-12-15 08:54:57.000000000 +0100
@@ -19,8 +19,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-bundle gpt/packaging_tools/perl/scripts/gpt-bundle
--- gpt.orig/packaging_tools/perl/scripts/gpt-bundle 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-bundle 2008-12-15 08:54:57.000000000 +0100
@@ -17,7 +17,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-config gpt/packaging_tools/perl/scripts/gpt-config
--- gpt.orig/packaging_tools/perl/scripts/gpt-config 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-config 2008-12-15 08:54:57.000000000 +0100
@@ -48,7 +48,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-convert-bundle-old2new gpt/packaging_tools/perl/scripts/gpt-convert-bundle-old2new
--- gpt.orig/packaging_tools/perl/scripts/gpt-convert-bundle-old2new 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-convert-bundle-old2new 2008-12-15 08:54:57.000000000 +0100
@@ -20,7 +20,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_convert_xml gpt/packaging_tools/perl/scripts/gpt_convert_xml
--- gpt.orig/packaging_tools/perl/scripts/gpt_convert_xml 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_convert_xml 2008-12-15 08:54:57.000000000 +0100
@@ -58,7 +58,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_create_automake_rules gpt/packaging_tools/perl/scripts/gpt_create_automake_rules
--- gpt.orig/packaging_tools/perl/scripts/gpt_create_automake_rules 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_create_automake_rules 2008-12-15 08:54:57.000000000 +0100
@@ -20,8 +20,7 @@
my $gpath = $ENV{GPT_LOCATION};
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
{
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-deps gpt/packaging_tools/perl/scripts/gpt-deps
--- gpt.orig/packaging_tools/perl/scripts/gpt-deps 2008-12-15 08:46:56.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-deps 2008-12-15 08:54:57.000000000 +0100
@@ -18,6 +18,16 @@
my $gpt_path = $ENV{GPT_LOCATION};
my $globus_path = $ENV{GLOBUS_LOCATION};
+if ( !defined($gpt_path) )
+{
+ $gpt_path = "/usr";
+}
+
+if ( !defined($globus_path) )
+{
+ $globus_path = "/usr";
+}
+
if ( !defined($gpt_path) && !defined($globus_path) )
{
die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_extract_data gpt/packaging_tools/perl/scripts/gpt_extract_data
--- gpt.orig/packaging_tools/perl/scripts/gpt_extract_data 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_extract_data 2008-12-15 08:54:57.000000000 +0100
@@ -18,8 +18,7 @@
my $gpath = $ENV{GPT_LOCATION};
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
{
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-filelist-convert gpt/packaging_tools/perl/scripts/gpt-filelist-convert
--- gpt.orig/packaging_tools/perl/scripts/gpt-filelist-convert 2008-12-15 08:46:17.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-filelist-convert 2008-12-15 08:54:57.000000000 +0100
@@ -19,6 +19,16 @@
my $globus_path = $ENV{GLOBUS_LOCATION};
my $gpath;
+if ( !defined($gpt_path) )
+{
+ $gpt_path = "/usr";
+}
+
+if ( !defined($globus_path) )
+{
+ $globus_path = "/usr";
+}
+
if ( !defined($gpt_path) && !defined($globus_path) )
{
die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
@@ -103,7 +113,7 @@
{
my $fl = new Grid::GPT::PackageFilelist(
context => "installdir",
- contextData => { dir => $ENV{'GLOBUS_LOCATION'}, },
+ contextData => { dir => $globus_path, },
pkgnode => $pkg,
convert => 1,
);
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-filelist-copy gpt/packaging_tools/perl/scripts/gpt-filelist-copy
--- gpt.orig/packaging_tools/perl/scripts/gpt-filelist-copy 2008-12-15 08:47:24.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-filelist-copy 2008-12-15 08:54:57.000000000 +0100
@@ -19,6 +19,16 @@
my $globus_path = $ENV{GLOBUS_LOCATION};
my $gpath;
+if ( !defined($gpt_path) )
+{
+ $gpt_path = "/usr";
+}
+
+if ( !defined($globus_path) )
+{
+ $globus_path = "/usr";
+}
+
if ( !defined($gpt_path) && !defined($globus_path) )
{
die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
@@ -109,7 +119,7 @@
{
my $fl = new Grid::GPT::PackageFilelist(
context => "installdir",
- contextData => { dir => $ENV{'GLOBUS_LOCATION'}, },
+ contextData => { dir => $globus_path, },
pkgnode => $pkg,
convert => 0,
);
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-file-remove gpt/packaging_tools/perl/scripts/gpt-file-remove
--- gpt.orig/packaging_tools/perl/scripts/gpt-file-remove 2008-12-15 08:46:44.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-file-remove 2008-12-15 08:54:57.000000000 +0100
@@ -19,6 +19,16 @@
my $globus_path = $ENV{GLOBUS_LOCATION};
my $gpath;
+if ( !defined($gpt_path) )
+{
+ $gpt_path = "/usr";
+}
+
+if ( !defined($globus_path) )
+{
+ $globus_path = "/usr";
+}
+
if ( !defined($gpt_path) && !defined($globus_path) )
{
die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-flavor-configuration gpt/packaging_tools/perl/scripts/gpt-flavor-configuration
--- gpt.orig/packaging_tools/perl/scripts/gpt-flavor-configuration 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-flavor-configuration 2008-12-15 08:54:57.000000000 +0100
@@ -19,8 +19,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data gpt/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data
--- gpt.orig/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data 2006-01-11 17:56:50.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data 2008-12-15 08:54:57.000000000 +0100
@@ -18,8 +18,7 @@
my $gpath = $ENV{GPT_LOCATION};
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
{
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-install gpt/packaging_tools/perl/scripts/gpt-install
--- gpt.orig/packaging_tools/perl/scripts/gpt-install 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-install 2008-12-15 08:54:57.000000000 +0100
@@ -21,8 +21,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-link gpt/packaging_tools/perl/scripts/gpt-link
--- gpt.orig/packaging_tools/perl/scripts/gpt-link 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-link 2008-12-15 08:54:57.000000000 +0100
@@ -20,8 +20,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-md5 gpt/packaging_tools/perl/scripts/gpt-md5
--- gpt.orig/packaging_tools/perl/scripts/gpt-md5 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-md5 2008-12-15 08:54:57.000000000 +0100
@@ -18,7 +18,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-pkg gpt/packaging_tools/perl/scripts/gpt-pkg
--- gpt.orig/packaging_tools/perl/scripts/gpt-pkg 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-pkg 2008-12-15 08:54:57.000000000 +0100
@@ -20,8 +20,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-postinstall gpt/packaging_tools/perl/scripts/gpt-postinstall
--- gpt.orig/packaging_tools/perl/scripts/gpt-postinstall 2008-12-15 08:47:11.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-postinstall 2008-12-15 08:54:57.000000000 +0100
@@ -26,6 +26,16 @@
my $globus_path = $ENV{GLOBUS_LOCATION};
my $verbose;
+if ( !defined($gpt_path) )
+{
+ $gpt_path = "/usr";
+}
+
+if ( !defined($globus_path) )
+{
+ $globus_path = "/usr";
+}
+
if ( !defined($gpt_path) && !defined($globus_path) )
{
die("GPT_LOCATION and GLOBUS_LOCATION needs to be set before running this script");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-query gpt/packaging_tools/perl/scripts/gpt-query
--- gpt.orig/packaging_tools/perl/scripts/gpt-query 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-query 2008-12-15 08:54:57.000000000 +0100
@@ -25,6 +25,16 @@
my $gpt_path = $ENV{GPT_LOCATION};
my $globus_path = $ENV{GLOBUS_LOCATION};
+if ( !defined($gpt_path) )
+{
+ $gpt_path = "/usr";
+}
+
+if ( !defined($globus_path) )
+{
+ $globus_path = "/usr";
+}
+
if ( !defined($gpt_path) && !defined($globus_path) )
{
die("GPT_LOCATION needs to be set before running this script");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_save_flavor gpt/packaging_tools/perl/scripts/gpt_save_flavor
--- gpt.orig/packaging_tools/perl/scripts/gpt_save_flavor 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_save_flavor 2008-12-15 08:54:57.000000000 +0100
@@ -18,8 +18,7 @@
my $gpath = $ENV{GPT_LOCATION};
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
{
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-setup gpt/packaging_tools/perl/scripts/gpt-setup
--- gpt.orig/packaging_tools/perl/scripts/gpt-setup 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-setup 2008-12-15 08:54:57.000000000 +0100
@@ -14,8 +14,7 @@
my $gpath = $ENV{GPT_LOCATION};
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
{
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_sort_filelist gpt/packaging_tools/perl/scripts/gpt_sort_filelist
--- gpt.orig/packaging_tools/perl/scripts/gpt_sort_filelist 2008-12-15 08:33:05.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_sort_filelist 2008-12-15 08:54:57.000000000 +0100
@@ -21,6 +21,16 @@
my $globus_path = $ENV{GLOBUS_LOCATION};
my $verbose = 0;
+if ( !defined($gpt_path) )
+{
+ $gpt_path = "/usr";
+}
+
+if ( !defined($globus_path) )
+{
+ $globus_path = "/usr";
+}
+
if ( !defined($gpt_path) && !defined($globus_path) )
{
die("GPT_LOCATION needs to be set before running this script");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-undefines gpt/packaging_tools/perl/scripts/gpt-undefines
--- gpt.orig/packaging_tools/perl/scripts/gpt-undefines 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-undefines 2008-12-15 08:54:57.000000000 +0100
@@ -20,8 +20,7 @@
my $gpath = $ENV{GPT_LOCATION};
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
{
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-uninstall gpt/packaging_tools/perl/scripts/gpt-uninstall
--- gpt.orig/packaging_tools/perl/scripts/gpt-uninstall 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-uninstall 2008-12-15 08:54:57.000000000 +0100
@@ -24,7 +24,7 @@
#
my $gpath = defined $ENV{GPT_LOCATION} ? $ENV{GPT_LOCATION}
- : $ENV{GLOBUS_LOCATION};
+ : "/usr";
if ( !defined($gpath))
{
die("GPT_LOCATION needs to be set before running this script");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-update gpt/packaging_tools/perl/scripts/gpt-update
--- gpt.orig/packaging_tools/perl/scripts/gpt-update 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-update 2008-12-15 08:54:57.000000000 +0100
@@ -14,8 +14,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-verify gpt/packaging_tools/perl/scripts/gpt-verify
--- gpt.orig/packaging_tools/perl/scripts/gpt-verify 2008-12-15 08:46:30.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-verify 2008-12-15 08:54:57.000000000 +0100
@@ -27,6 +27,16 @@
my $globus_path = $ENV{GLOBUS_LOCATION};
my $verbose;
+if ( !defined($gpt_path) )
+{
+ $gpt_path = "/usr";
+}
+
+if ( !defined($globus_path) )
+{
+ $globus_path = "/usr";
+}
+
if ( !defined($gpt_path) && !defined($globus_path) )
{
die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_version.in gpt/packaging_tools/perl/scripts/gpt_version.in
--- gpt.orig/packaging_tools/perl/scripts/gpt_version.in 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_version.in 2008-12-15 08:54:57.000000000 +0100
@@ -23,7 +23,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
+ $gpath = "/usr";
}
if (!defined($gpath))
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-virtual-pkg gpt/packaging_tools/perl/scripts/gpt-virtual-pkg
--- gpt.orig/packaging_tools/perl/scripts/gpt-virtual-pkg 2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-virtual-pkg 2008-12-15 08:54:57.000000000 +0100
@@ -20,8 +20,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-
+ $gpath = "/usr";
}
if (!defined($gpath))
grid-packaging-tools-version-info.patch:
--- NEW FILE grid-packaging-tools-version-info.patch ---
diff -ur gpt.orig/packaging_tools/etc/gpt_autoconf_macros.m4 gpt/packaging_tools/etc/gpt_autoconf_macros.m4
--- gpt.orig/packaging_tools/etc/gpt_autoconf_macros.m4 2009-03-16 19:17:35.000000000 +0100
+++ gpt/packaging_tools/etc/gpt_autoconf_macros.m4 2009-03-16 19:20:49.000000000 +0100
@@ -76,7 +76,7 @@
GPT_LIBS="$GPT_CONFIG_PKG_LIBS $GPT_CONFIG_LIBS"
GPT_LDFLAGS="$GPT_CONFIG_STATIC_LINKLINE $GPT_LDFLAGS"
GPT_PGM_LINKS="$GPT_CONFIG_PGM_LINKS $GPT_CONFIG_LIBS"
- GPT_LIB_LINKS="$GPT_CONFIG_LIB_LINKS $GPT_CONFIG_LIBS"
+ GPT_LIB_LINKS="-version-info $GPT_MAJOR_VERSION:$GPT_MINOR_VERSION:$GPT_AGE_VERSION $GPT_CONFIG_LIB_LINKS $GPT_CONFIG_LIBS"
grid-packaging-tools-xml.patch:
--- NEW FILE grid-packaging-tools-xml.patch ---
diff -ur gpt-3.2.orig/packaging_tools/perl/GPT/V1/XML.pm gpt-3.2/packaging_tools/perl/GPT/V1/XML.pm
--- gpt-3.2.orig/packaging_tools/perl/GPT/V1/XML.pm 2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/perl/GPT/V1/XML.pm 2008-07-02 07:48:13.000000000 +0200
@@ -275,10 +275,10 @@
my ($self, $tag) = @_;
local *FILE = *{$self->{'FILE'}};
- print FILE "<$tag->{'name'} ";
+ print FILE "<$tag->{'name'}";
for my $a (sort keys %{$tag->{attributes}}) {
- print FILE "$a=\"$tag->{attributes}->{$a}\" ";
+ print FILE " $a=\"$tag->{attributes}->{$a}\"";
}
if (@{$tag->{'contents'}} == 0) {
--- NEW FILE grid-packaging-tools.spec ---
Name: grid-packaging-tools
Version: 3.2
Release: 16%{?dist}
Summary: Grid Packaging Tools (GPT)
Group: Development/Tools
License: NCSA
URL: http://www.gridpackagingtools.org/
# The maintenance of GPT has been taken over by the Globus Alliance.
# Use the latest source tarball from their repository.
Source: http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
# Make perl module installation directory configurable:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
Patch0: %{name}-perlpath.patch
# Put data files in /usr/share not /etc (FHS):
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
Patch1: %{name}-share.patch
# Make installation in /usr work without environment variables:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
Patch2: %{name}-usr.patch
# Fix man page creation and installation:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
Patch3: %{name}-man.patch
# Fix filelist creation to work with the FHS installation...
# ... and move the .so symlinks to the dev package:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
Patch4: %{name}-filelists.patch
# Patch for globus package DTD:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6221
Patch5: %{name}-globus-package-dtd.patch
# Missing shebang:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6222
Patch6: %{name}-bootstrap-shebang.patch
# Fix extraction of flavored header names:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6223
Patch7: %{name}-flavored-headers.patch
# Don't mangle library names when ColocateLibraries = no:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6224
Patch8: %{name}-colocate-bugfix.patch
# Extract the age from the version tag as well:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6225
Patch9: %{name}-age-version.patch
# Don't hard-code target (so we can make a noarch RPM):
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6230
Patch10: %{name}-target.patch
# Better XML output:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6226
Patch11: %{name}-xml.patch
# Make gpt-update work outside /usr/sbin:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6227
Patch12: %{name}-gpt-update.patch
# Make configure --help look nice:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6438
Patch13: %{name}-helpstring.patch
# Make gpt work with older automake versions:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6564
Patch14: %{name}-compat.patch
# Forward library version info to libtool
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6694
Patch15: %{name}-version-info.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
BuildRequires: perl
Requires: gzip
Requires: tar
Requires: autoconf
Requires: automake
Requires: libtool
Requires: rpm
Requires: rpm-build
%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
BuildArch: noarch
%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
%description
GPT is a collection of packaging tools built around an XML based
packaging data format. This format provides a straight forward way to
define complex dependency and compatibility relationships between
packages. The tools provide a means for developers to easily define the
packaging data and include it as part of their source code distribution.
Binary packages can be automatically generated from this data. The
packages defined by GPT are compatible with other packages and can be
easily converted.
%prep
%setup -q -n gpt
%patch0 -p1 -b .perl
%patch1 -p1 -b .share
%patch2 -p1 -b .usr
%patch3 -p1 -b .man
%patch4 -p1 -b .filelists
%patch5 -p1 -b .dtdfix
%patch6 -p1 -b .shebang
%patch7 -p1 -b .flavor
%patch8 -p1 -b .colocate
%patch9 -p1 -b .age
%patch10 -p1 -b .target
%patch11 -p1 -b .xmlfix
%patch12 -p1 -b .gptupdate
%patch13 -p1 -b .help
%patch14 -p1 -b .compat
%patch15 -p1 -b .version
iconv -f iso-8859-1 -t utf-8 LICENSE > LICENSE.utf8
touch -c -r LICENSE LICENSE.utf8
mv LICENSE.utf8 LICENSE
%build
cd packaging_tools
touch aclocal.m4
touch Makefile.in
touch configure
for i in config.guess config.sub ; do
[ -f /usr/share/libtool/$i ] && rm $i && cp -p /usr/share/libtool/$i $i
done
%configure --libexecdir='${datadir}/globus' \
--with-perlmoduledir=%{perl_vendorlib} \
--disable-compat
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
cd packaging_tools
make install DESTDIR=$RPM_BUILD_ROOT
make install-man DESTDIR=$RPM_BUILD_ROOT
cd ..
# Remove perl version check script that is not used for anything (and even
# gets installed without shebang so it is not executable from the path)
rm $RPM_BUILD_ROOT%{_sbindir}/gpt-perl-version
# Remove old globus core source tarball - users should install an up-to-date
# globus-core package instead of having gpt compile it from source
rm $RPM_BUILD_ROOT%{_datadir}/globus/globus_core-src.tar.gz
# Remove temporary build file
rm $RPM_BUILD_ROOT%{_datadir}/globus/gpt_scripts_list
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE README
%{_sbindir}/*
%{_datadir}/globus
%{_mandir}/man8/*
%{perl_vendorlib}/Grid
%changelog
* Mon Mar 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-16
- Adding version-info patch
* Fri Feb 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-15
- Newest version of redhat-rpm-config doesn't copy config.guess by default
in the configure macro anymore - added explicit copy
* Mon Feb 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-14
- Added BuildRequires on perl
- Moved license charset conversion to prep section
- Added comments with reasons for removing installed files
* Tue Dec 16 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-13
- change name from gpt to grid-packaging-tools to avoid potential confusion
with ubuntu's gpt package (G-Portugol)
* Tue Dec 9 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
- Make gpt work with older automake versions
* Sat Oct 4 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
- Add some backward compatibility
- Make perl module directory configurable
* Sun Jul 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-10
- use the sources from Globus Alliance since those are maintained
- split the big FHS patch into several smaller ones
- change name back gpt again
* Wed Jul 2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
- change name from gpt to grid-packaging-tools
* Wed Jul 2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
- Convert to noarch package
* Tue Jun 24 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-7
- Add export of GPT_AGE_VERSION
* Sat Jun 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-6
- Install in /usr instead of /opt/gpt - quite some work...
- Make it work without having GPT_LOCATION set if we are in /usr
- Drop the /etc/profile.d scripts (not needed since we are now in /usr)
- Do not build and install dependencies - use system versions
- Use RPM Group "Development/Tools"
* Tue Jun 19 2007 Anders Wäänänen <waananen at nbi.dk> - 3.2-5ng
- Add dist tag to release
- Change BuildRoot
* Wed Jun 1 2005 Anders Wäänänen <waananen at nbi.dk> - 3.2-4ng
- Add fix to setup dir handling
- Restructure changelog to have versions on main line
* Fri Mar 18 2005 Anders Wäänänen <waananen at nbi.dk> - 3.2-3ng
- Add patch to fix globus_package.dtd
* Tue Mar 1 2005 Anders Wäänänen <waananen at nbi.dk> - 3.2-2ng
- Add patch with fixes from the Globus 3.9.5 GPT release
(Do not include the core though)
* Fri May 21 2004 Anders Wäänänen <waananen at nbi.dk> - 3.2-1ng
* Sun Feb 1 2004 Anders Wäänänen <waananen at nbi.dk> - 3.1-3ng
- Fix problem when new files are links rather than directories
* Thu Jan 8 2004 Anders Wäänänen <waananen at nbi.dk> - 3.1-2ng
- Fix for Mandrake 9.2 - unset RPM_BUILD_ROOT before building
Found by Jakob Langgaard Nielsen <langgard at nbi.dk>
* Sat Jan 3 2004 Anders Wäänänen <waananen at nbi.dk> - 3.1-1ng
- Drop patches: gpt-3.0.1-dependency.patch, gpt-3.0.1-doc.patch
since the problems involved are either solved or obsolete
- Make /etc/profile.d relocatable
- Use gpt_location macro to define GPT_LOCATION
- Use RPM Group "System Environment/Base" instead of Applications
- Slightly change build procedure
* Tue Oct 7 2003 Anders Wäänänen <waananen at nbi.dk> - 3.0.1-1ng
- Remove the now unecessary dependency cleanup introduced in 2.2.10-2ng
- Fix some cases in the documentation
* Tue Jun 24 2003 Anders Wäänänen <waananen at nbi.dk> - 2.2.10-2ng
- Dependency cleanup by Mattias Ellert <mattias.ellert at tsl.uu.se>
* Mon Jun 23 2003 Anders Wäänänen <waananen at nbi.dk> - 2.2.10
* Sat Jun 2 2003 Anders Wäänänen <waananen at nbi.dk> - 3.1a1-2
- Fix perl inconsistencies reported by Mattias Ellert
<mattias.ellert at tsl.uu.se>
* Sat May 24 2003 Anders Wäänänen <waananen at nbi.dk> - 3.1a1
- Bring back perl-Tk dependency
* Mon Apr 7 2003 Anders Wäänänen <waananen at nbi.dk> - 3.0-1ng
* Tue Mar 22 2003 Anders Wäänänen <waananen at nbi.dk> - 2.2.9-1ng
- Add bogus perl(Grid::GPT::Version) provides to help rpm
* Tue Mar 4 2003 Anders Wäänänen <waananen at nbi.dk> - 2.2.8-1ng
* Tue Dec 5 2002 Anders Wäänänen <waananen at nbi.dk> - 2.2.7-1ng
* Tue Nov 5 2002 Anders Wäänänen <waananen at nbi.dk> - 2.2.5-1ng
- Remove Tk dependence for RedHat 8.0
* Tue Oct 29 2002 Anders Wäänänen <waananen at nbi.dk> - 2.2.4-2ng
- Insert missing backslash in csh profile script
* Tue Sep 24 2002 Anders Wäänänen <waananen at nbi.dk>
- Use 2.2 final
* Sat Aug 31 2002 Anders Wäänänen <waananen at nbi.dk>
- Use 2.2rc1 tarball from Globus CVS
* Thu Aug 15 2002 Anders Wäänänen <waananen at nbi.dk>
- Use NCSA distribution instead of Globus
* Mon Apr 8 2002 Anders Wäänänen <waananen at nbi.dk>
- Initial build.
--- NEW FILE import.log ---
grid-packaging-tools-3_2-16_fc9:F-10:grid-packaging-tools-3.2-16.fc9.src.rpm:1237369843
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Mar 2009 03:45:10 -0000 1.1
+++ .cvsignore 18 Mar 2009 09:51:25 -0000 1.2
@@ -0,0 +1 @@
+gpt-3.2globus2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Mar 2009 03:45:10 -0000 1.1
+++ sources 18 Mar 2009 09:51:25 -0000 1.2
@@ -0,0 +1 @@
+988dfe71611afcd3768141eaf2fb985c gpt-3.2globus2.tar.gz
- Previous message (by thread): rpms/ocaml-pa-do/F-10 ocaml-pa-do.spec,1.1,1.2
- Next message (by thread): rpms/grid-packaging-tools/EL-4 grid-packaging-tools-age-version.patch, NONE, 1.1 grid-packaging-tools-bootstrap-shebang.patch, NONE, 1.1 grid-packaging-tools-colocate-bugfix.patch, NONE, 1.1 grid-packaging-tools-compat.patch, NONE, 1.1 grid-packaging-tools-filelists.patch, NONE, 1.1 grid-packaging-tools-flavored-headers.patch, NONE, 1.1 grid-packaging-tools-globus-package-dtd.patch, NONE, 1.1 grid-packaging-tools-gpt-update.patch, NONE, 1.1 grid-packaging-tools-helpstring.patch, NONE, 1.1 grid-packaging-tools-man.patch, NONE, 1.1 grid-packaging-tools-perlpath.patch, NONE, 1.1 grid-packaging-tools-share.patch, NONE, 1.1 grid-packaging-tools-target.patch, NONE, 1.1 grid-packaging-tools-usr.patch, NONE, 1.1 grid-packaging-tools-version-info.patch, NONE, 1.1 grid-packaging-tools-xml.patch, NONE, 1.1 grid-packaging-tools.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list