[grid-packaging-tools] Fix problem with special characters in buildroot path

[Mattias Ellert]

commit 6a19443698347b0fd159669117d40798d4ec0519
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Mar 24 20:44:30 2011 +0100

    Fix problem with special characters in buildroot path

 grid-packaging-tools-path-with-plus.patch |   15 +++++++++++++++
 grid-packaging-tools.spec                 |    9 ++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/grid-packaging-tools-path-with-plus.patch b/grid-packaging-tools-path-with-plus.patch
new file mode 100644
index 0000000..7f3c236
--- /dev/null
+++ b/grid-packaging-tools-path-with-plus.patch
@@ -0,0 +1,15 @@
+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	2011-03-24 19:09:21.334573929 +0100
+@@ -110,7 +110,10 @@
+     my $file = $_;
+     my $dir = $File::Find::dir;
+ #    print "find_makefile_am: $dir\n";
+-    $dir =~ s!$topdir/+!!;
++    if (substr("$dir", 0, length("$topdir")) eq "$topdir") {
++      $dir = substr("$dir", length("$topdir"));
++    }
++    $dir =~ s!^/!!;
+     process_automake_file($file) if ! defined $excluded_dirs{$dir};
+ }
+ 
diff --git a/grid-packaging-tools.spec b/grid-packaging-tools.spec
index 22fd12b..61e9a88 100644
--- a/grid-packaging-tools.spec
+++ b/grid-packaging-tools.spec
@@ -1,6 +1,6 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	23%{?dist}
+Release:	24%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
@@ -61,6 +61,9 @@ 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool
 BuildRequires:	perl
@@ -113,6 +116,7 @@ easily converted.
 %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
@@ -170,6 +174,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Thu Mar 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-24
+- Fix problem with special characters in buildroot path
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild