[grid-packaging-tools/el4: 3/3] Update to version 3.5 Drop patches implemented upstream
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:18:14 UTC 2012
commit 484a94a4992cc0e8d72530b8e9cea8641bc3b788
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Fri Jan 6 23:51:25 2012 +0100
Update to version 3.5
Drop patches implemented upstream
.gitignore | 2 +-
grid-packaging-tools-age-version.patch | 24 -
grid-packaging-tools-bootstrap-shebang.patch | 9 -
grid-packaging-tools-colocate-bugfix.patch | 12 -
grid-packaging-tools-compat.patch | 20 -
grid-packaging-tools-filelists.patch | 187 -----
grid-packaging-tools-flavored-headers.patch | 11 -
grid-packaging-tools-globus-package-dtd.patch | 110 ---
grid-packaging-tools-gpt-update.patch | 32 -
grid-packaging-tools-helpstring.patch | 12 -
grid-packaging-tools-initializer.patch | 148 ++++
grid-packaging-tools-man.patch | 500 -------------
grid-packaging-tools-path-with-plus.patch | 15 -
grid-packaging-tools-perlpath.patch | 388 ----------
grid-packaging-tools-share.patch | 956 -------------------------
grid-packaging-tools-target.patch | 204 ------
grid-packaging-tools-unshift.patch | 36 +
grid-packaging-tools-usr.patch | 764 --------------------
grid-packaging-tools-version-info.patch | 12 -
grid-packaging-tools-versions.patch | 15 +
grid-packaging-tools-wrong-url.patch | 52 --
grid-packaging-tools-xml.patch | 16 -
grid-packaging-tools.spec | 140 +---
sources | 2 +-
24 files changed, 228 insertions(+), 3439 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 199b809..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-gpt-3.2globus2.tar.gz
+/*.tar.gz
diff --git a/grid-packaging-tools-initializer.patch b/grid-packaging-tools-initializer.patch
new file mode 100644
index 0000000..fffa993
--- /dev/null
+++ b/grid-packaging-tools-initializer.patch
@@ -0,0 +1,148 @@
+diff -ur gpt-3.5.orig/configure gpt-3.5/configure
+--- gpt-3.5.orig/configure 2011-12-12 21:15:25.000000000 +0100
++++ gpt-3.5/configure 2011-12-20 04:36:26.372012894 +0100
+@@ -1990,34 +1990,13 @@
+ my (\$datarootdir, \$datadir, \$perlmoduledir, \$gptdatadir);
+ my (\$gptexecsharedir, \$amdir, \$pkg_confdir, \$aclocaldir);
+
+-sub eval_path
+-{
+- my \$path = shift;
+- my \$last = \$path;
+-
+- while (\$path =~ m/\\\${([^}]*)}/)
+- {
+- my \$varname = \${1};
+- my \$evaluated;
+- eval "\\\$evaluated = \\\${\$varname}";
+-
+- \$path =~ s/\\\${\$varname}/\$evaluated/g;
+- if (\$path eq \$last)
+- {
+- die "Error evaluating \$last\n";
+- }
+- \$last = \$path;
+- }
+- return \$path;
+-}
+-
+ if (exists \$ENV{GPT_LOCATION})
+ {
+ \$prefix = \$ENV{GPT_LOCATION};
+ }
+ else
+ {
+- \$prefix = '$initializer_prefix';
++ \$prefix = "$initializer_prefix";
+ }
+
+ if (exists \$ENV{GLOBUS_LOCATION})
+@@ -2026,21 +2005,21 @@
+ }
+ else
+ {
+- \$globus_prefix = '$initializer_prefix';
++ \$globus_prefix = "$initializer_prefix";
+ }
+
+-\$exec_prefix = eval_path('$initializer_exec_prefix');
+-\$bindir = eval_path('$bindir');
+-\$sbindir = eval_path('$sbindir');
+-\$libdir = eval_path('$libdir');
+-\$datarootdir = eval_path('$datarootdir');
+-\$datadir = eval_path('$datadir');
+-\$perlmoduledir = eval_path('$perlmoduledir');
+-\$gptdatadir = eval_path('$gptdatadir');
+-\$gptexecsharedir = eval_path('$gptexecsharedir');
+-\$amdir = eval_path('$amdir');
+-\$pkg_confdir = eval_path('$pkg_confdir');
+-\$aclocaldir = eval_path('$aclocaldir');
++\$exec_prefix = "$initializer_exec_prefix";
++\$bindir = "$bindir";
++\$sbindir = "$sbindir";
++\$libdir = "$libdir";
++\$datarootdir = "$datarootdir";
++\$datadir = "$datadir";
++\$perlmoduledir = "$perlmoduledir";
++\$gptdatadir = "$gptdatadir";
++\$gptexecsharedir = "$gptexecsharedir";
++\$amdir = "$amdir";
++\$pkg_confdir = "$pkg_confdir";
++\$aclocaldir = "$aclocaldir";
+
+ push(@INC, "\${perlmoduledir}");
+ EOF
+diff -ur gpt-3.5.orig/configure.ac gpt-3.5/configure.ac
+--- gpt-3.5.orig/configure.ac 2011-10-28 19:24:30.000000000 +0200
++++ gpt-3.5/configure.ac 2011-12-20 04:34:03.776013585 +0100
+@@ -79,34 +79,13 @@
+ my (\$datarootdir, \$datadir, \$perlmoduledir, \$gptdatadir);
+ my (\$gptexecsharedir, \$amdir, \$pkg_confdir, \$aclocaldir);
+
+-sub eval_path
+-{
+- my \$path = shift;
+- my \$last = \$path;
+-
+- while (\$path =~ m/\\\${([[^}]]*)}/)
+- {
+- my \$varname = \${1};
+- my \$evaluated;
+- eval "\\\$evaluated = \\\${\$varname}";
+-
+- \$path =~ s/\\\${\$varname}/\$evaluated/g;
+- if (\$path eq \$last)
+- {
+- die "Error evaluating \$last\n";
+- }
+- \$last = \$path;
+- }
+- return \$path;
+-}
+-
+ if (exists \$ENV{GPT_LOCATION})
+ {
+ \$prefix = \$ENV{GPT_LOCATION};
+ }
+ else
+ {
+- \$prefix = '$initializer_prefix';
++ \$prefix = "$initializer_prefix";
+ }
+
+ if (exists \$ENV{GLOBUS_LOCATION})
+@@ -115,21 +94,21 @@
+ }
+ else
+ {
+- \$globus_prefix = '$initializer_prefix';
++ \$globus_prefix = "$initializer_prefix";
+ }
+
+-\$exec_prefix = eval_path('$initializer_exec_prefix');
+-\$bindir = eval_path('$bindir');
+-\$sbindir = eval_path('$sbindir');
+-\$libdir = eval_path('$libdir');
+-\$datarootdir = eval_path('$datarootdir');
+-\$datadir = eval_path('$datadir');
+-\$perlmoduledir = eval_path('$perlmoduledir');
+-\$gptdatadir = eval_path('$gptdatadir');
+-\$gptexecsharedir = eval_path('$gptexecsharedir');
+-\$amdir = eval_path('$amdir');
+-\$pkg_confdir = eval_path('$pkg_confdir');
+-\$aclocaldir = eval_path('$aclocaldir');
++\$exec_prefix = "$initializer_exec_prefix";
++\$bindir = "$bindir";
++\$sbindir = "$sbindir";
++\$libdir = "$libdir";
++\$datarootdir = "$datarootdir";
++\$datadir = "$datadir";
++\$perlmoduledir = "$perlmoduledir";
++\$gptdatadir = "$gptdatadir";
++\$gptexecsharedir = "$gptexecsharedir";
++\$amdir = "$amdir";
++\$pkg_confdir = "$pkg_confdir";
++\$aclocaldir = "$aclocaldir";
+
+ push(@INC, "\${perlmoduledir}");
+ EOF
diff --git a/grid-packaging-tools-unshift.patch b/grid-packaging-tools-unshift.patch
new file mode 100644
index 0000000..4182ae4
--- /dev/null
+++ b/grid-packaging-tools-unshift.patch
@@ -0,0 +1,36 @@
+diff -ur gpt-3.5.orig/configure gpt-3.5/configure
+--- gpt-3.5.orig/configure 2011-12-20 04:36:26.372012894 +0100
++++ gpt-3.5/configure 2011-12-20 04:39:36.476013588 +0100
+@@ -2021,7 +2021,7 @@
+ \$pkg_confdir = "$pkg_confdir";
+ \$aclocaldir = "$aclocaldir";
+
+-push(@INC, "\${perlmoduledir}");
++unshift(@INC, "\${perlmoduledir}");
+ EOF
+
+ GPT_PERL_INITIALIZER=gpt-perl-initializer
+diff -ur gpt-3.5.orig/configure.ac gpt-3.5/configure.ac
+--- gpt-3.5.orig/configure.ac 2011-12-20 04:34:03.776013585 +0100
++++ gpt-3.5/configure.ac 2011-12-20 04:39:23.788013145 +0100
+@@ -110,7 +110,7 @@
+ \$pkg_confdir = "$pkg_confdir";
+ \$aclocaldir = "$aclocaldir";
+
+-push(@INC, "\${perlmoduledir}");
++unshift(@INC, "\${perlmoduledir}");
+ EOF
+
+ GPT_PERL_INITIALIZER=gpt-perl-initializer
+diff -ur gpt-3.5.orig/perl/GPT/FilelistFunctions.pm gpt-3.5/perl/GPT/FilelistFunctions.pm
+--- gpt-3.5.orig/perl/GPT/FilelistFunctions.pm 2011-10-28 19:24:30.000000000 +0200
++++ gpt-3.5/perl/GPT/FilelistFunctions.pm 2011-12-20 04:39:23.788013145 +0100
+@@ -416,7 +416,7 @@
+ # Found a package specific file sorting module
+
+ # Add srcdir to package search path
+- push @INC, $srcdir;
++ unshift(@INC, $srcdir);
+
+ require MyFilelists;
+ $sort = new MyFilelists(list => $master_filelist, flavor => $flavor,
diff --git a/grid-packaging-tools-versions.patch b/grid-packaging-tools-versions.patch
new file mode 100644
index 0000000..1aae619
--- /dev/null
+++ b/grid-packaging-tools-versions.patch
@@ -0,0 +1,15 @@
+diff -ur gpt-3.5.orig/perl/scripts/gpt-to-pkgconfig gpt-3.5/perl/scripts/gpt-to-pkgconfig
+--- gpt-3.5.orig/perl/scripts/gpt-to-pkgconfig 2011-10-28 19:24:30.000000000 +0200
++++ gpt-3.5/perl/scripts/gpt-to-pkgconfig 2011-11-28 05:43:18.484930178 +0100
+@@ -48,8 +48,9 @@
+ {
+ my $depname = $dep->{Name};
+ $depname =~ tr/_/-/;
+- my $depverelement = (grep { $_->isa('GPT::Simple_Version') }
+- @{$dep->{Kids}})[0];
++ my $depversion = (grep {$_->isa('GPT::Version')} @{$dep->{Kids}})[0];
++ my $depverelement = (grep {$_->isa('GPT::Simple_Version')}
++ @{$depversion->{Kids}})[0];
+ my $depver = $depverelement->{Major};
+ $deps{$depname} = $depver;
+ }
diff --git a/grid-packaging-tools.spec b/grid-packaging-tools.spec
index 68fa78d..3fe1778 100644
--- a/grid-packaging-tools.spec
+++ b/grid-packaging-tools.spec
@@ -1,69 +1,19 @@
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
Name: grid-packaging-tools
-Version: 3.2
-Release: 26%{?dist}
+Version: 3.5
+Release: 1%{?dist}
Summary: Grid Packaging Tools (GPT)
Group: Development/Tools
License: NCSA
URL: http://www.gridpackagingtools.com/
-# Maintenance of GPT has been taken over by the Globus Alliance.
+# Maintenance of GPT has been taken over by Globus.
# 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 and newer 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
-# Wrong URLs in documentation:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6705
-Patch16: %{name}-wrong-url.patch
-# Fix problem with special characters in buildroot path:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7153
-Patch17: %{name}-path-with-plus.patch
+Source: http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/gpt-%{version}.tar.gz
+Patch0: %{name}-initializer.patch
+Patch1: %{name}-versions.patch
+Patch2: %{name}-unshift.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
BuildRequires: perl
@@ -74,19 +24,9 @@ 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
@@ -98,32 +38,10 @@ 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
-%patch16 -p1 -b .url
-%patch17 -p1 -b .plus
-
-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
+%setup -q -n gpt-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
touch aclocal.m4
touch Makefile.in
@@ -133,34 +51,26 @@ for i in config.guess config.sub ; do
[ -f /usr/share/libtool/$i ] && rm $i && cp -p /usr/share/libtool/$i $i
done
+%build
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
%configure --libexecdir='${datadir}/globus' \
- --with-perlmoduledir=%{perl_vendorlib} \
- --disable-compat
+ --with-perlmoduledir=%{perl_vendorlib}
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 references to libdir so that the package is architecture independent
+sed '/^$libdir/d' -i $RPM_BUILD_ROOT%{_sbindir}/* \
+ $RPM_BUILD_ROOT%{perl_vendorlib}/Grid/GPT/PkgMngmt/SetupBuildFlavors.pm \
+ $RPM_BUILD_ROOT%{perl_vendorlib}/Grid/GPT/Locations.pm
# 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
-
-# Rename config.guess script in order not to clash with globus-common
-mv $RPM_BUILD_ROOT%{_datadir}/globus/{config.guess,config.guess.gpt}
-sed s/config.guess/config.guess.gpt/ \
- -i $RPM_BUILD_ROOT%{perl_vendorlib}/Grid/GPT/Localize.pm
+rm $RPM_BUILD_ROOT%{_datadir}/globus/gpt/globus_core-src.tar.gz
%clean
rm -rf $RPM_BUILD_ROOT
@@ -174,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/Grid
%changelog
+* Tue Dec 13 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.5-1
+- Update to version 3.5
+- Drop patches implemented upstream
+
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 3.2-26
- Perl mass rebuild
@@ -189,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 3.2-22
- Mass rebuild with perl-5.12.0
-* Fri Dec 4 2009 Stepan Kasal <skasal at redhat.com> - 3.2-21
+* Fri Dec 04 2009 Stepan Kasal <skasal at redhat.com> - 3.2-21
- rebuild against perl 5.10.1
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
diff --git a/sources b/sources
index 192141d..96277ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-988dfe71611afcd3768141eaf2fb985c gpt-3.2globus2.tar.gz
+0ecf339b7f2ee7066373eb3670110d3a gpt-3.5.tar.gz
More information about the scm-commits
mailing list