[grid-packaging-tools/el5: 3/3] Update to version 3.6.3

[Mattias Ellert]

commit 6a37019de33677f89328d686a94955a14047ac4c
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 11:42:22 2012 +0100

    Update to version 3.6.3

 grid-packaging-tools-syntax.patch |   12 ++++++++++++
 grid-packaging-tools.spec         |   36 ++++++++++++++++--------------------
 sources                           |    2 +-
 3 files changed, 29 insertions(+), 21 deletions(-)
---
diff --git a/grid-packaging-tools-syntax.patch b/grid-packaging-tools-syntax.patch
new file mode 100644
index 0000000..c155926
--- /dev/null
+++ b/grid-packaging-tools-syntax.patch
@@ -0,0 +1,12 @@
+diff -ur gpt-3.6.3.orig/perl/GPT/V1/Bundle.pm gpt-3.6.3/perl/GPT/V1/Bundle.pm
+--- gpt-3.6.3.orig/perl/GPT/V1/Bundle.pm	2011-02-08 21:10:09.000000000 +0100
++++ gpt-3.6.3/perl/GPT/V1/Bundle.pm	2012-12-04 13:23:12.226938303 +0100
+@@ -1188,7 +1188,7 @@
+                                          flavor  => $p->{'Flavor'},
+                                          pkgtype => $p->{'Type'} );
+ 
+-  if( defined(@$installed_pkgs) )
++  if( @$installed_pkgs )
+   {
+     for my $c (@$installed_pkgs)
+     {
diff --git a/grid-packaging-tools.spec b/grid-packaging-tools.spec
index 536ff2d..c970f17 100644
--- a/grid-packaging-tools.spec
+++ b/grid-packaging-tools.spec
@@ -1,8 +1,8 @@
 %{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:		grid-packaging-tools
-Version:	3.6.2
-Release:	3%{?dist}
+Version:	3.6.3
+Release:	1%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
@@ -10,7 +10,8 @@ License:	NCSA
 URL:		http://www.gridpackagingtools.com/
 #		Maintenance of GPT has been taken over by Globus.
 #		Use the latest source tarball from their repository.
-Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.1/packages/src/gpt-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.3/packages/src/gpt-%{version}.tar.gz
+Patch0:		%{name}-syntax.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool
 BuildRequires:	perl
@@ -36,6 +37,7 @@ easily converted.
 
 %prep
 %setup -q -n gpt-%{version}
+%patch0 -p1
 
 touch aclocal.m4
 touch Makefile.in
@@ -53,21 +55,21 @@ unset GPT_LOCATION
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # 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
+sed '/^$libdir/d' -i %{buildroot}%{_sbindir}/* \
+    %{buildroot}%{perl_vendorlib}/Grid/GPT/PkgMngmt/SetupBuildFlavors.pm \
+    %{buildroot}%{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/gpt/globus_core-src.tar.gz
+rm %{buildroot}%{_datadir}/globus/gpt/globus_core-src.tar.gz
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -78,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.6.3-1
+- Update to version 3.6.3
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -208,16 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 * 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 02 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 07 2003 Anders Wäänänen <waananen at nbi.dk> - 3.0-1ng
+* Mon Jun 23 2003 Anders Wäänänen <waananen at nbi.dk> - 2.2.10-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
diff --git a/sources b/sources
index 4241f25..d242bfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78a318a9924b0472714b2ee983511a36  gpt-3.6.2.tar.gz
+f50c147ed795b80a387adec483934d21  gpt-3.6.3.tar.gz