[grid-packaging-tools/el4] Portability fixes

[Mattias Ellert]

commit 90f367d21241476be739d904c1f34cec2f80d329
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Jan 23 19:59:10 2012 +0100

    Portability fixes

 grid-packaging-tools-autotools.patch |   12 ++++++++++++
 grid-packaging-tools-porting.patch   |   12 ++++++++++++
 grid-packaging-tools.spec            |    9 ++++++++-
 3 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/grid-packaging-tools-autotools.patch b/grid-packaging-tools-autotools.patch
new file mode 100644
index 0000000..79e59cb
--- /dev/null
+++ b/grid-packaging-tools-autotools.patch
@@ -0,0 +1,12 @@
+diff -ur gpt-3.5.orig/etc/gpt_autoconf_macros.m4 gpt-3.5/etc/gpt_autoconf_macros.m4
+--- gpt-3.5.orig/etc/gpt_autoconf_macros.m4	2011-02-03 21:46:15.000000000 +0100
++++ gpt-3.5/etc/gpt_autoconf_macros.m4	2012-01-14 13:29:05.509202473 +0100
+@@ -4,7 +4,7 @@
+ 
+ 	dnl --with-docdir for older autoconf (<2.60)
+ 	AC_ARG_WITH([docdir],
+-	AC_HELP_STRING([--with-docdir=DIR], [Install documentation in DIR [[default: ${datadir}/doc/$PACKAGE]]]),
++	AC_HELP_STRING([--with-docdir=DIR], [Install documentation in DIR [[DATADIR/doc/PACKAGE]]]),
+         [case $withval in 
+ 	  yes|no)
+ 		AC_MSG_ERROR([Invalid DIR])
diff --git a/grid-packaging-tools-porting.patch b/grid-packaging-tools-porting.patch
new file mode 100644
index 0000000..b706eaf
--- /dev/null
+++ b/grid-packaging-tools-porting.patch
@@ -0,0 +1,12 @@
+diff -ur gpt-3.5.orig/perl/scripts/gpt_get_lib_names.in gpt-3.5/perl/scripts/gpt_get_lib_names.in
+--- gpt-3.5.orig/perl/scripts/gpt_get_lib_names.in	2011-02-08 21:10:09.000000000 +0100
++++ gpt-3.5/perl/scripts/gpt_get_lib_names.in	2012-01-12 06:39:28.801547696 +0100
+@@ -14,6 +14,8 @@
+ my $extradev_map =
+ {
+     'linux' => [ '\.so$' ],
++    'gnu' => [ '\.so$' ],
++    'gnukfreebsd' => [ '\.so$' ],
+     'solaris' => [ '\.so$' ],
+     'darwin' => [ '^lib[^\.]*.dylib$' ],
+ };
diff --git a/grid-packaging-tools.spec b/grid-packaging-tools.spec
index 3fe1778..d8f3679 100644
--- a/grid-packaging-tools.spec
+++ b/grid-packaging-tools.spec
@@ -2,7 +2,7 @@
 
 Name:		grid-packaging-tools
 Version:	3.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
@@ -14,6 +14,8 @@ Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/gpt-%{version}.
 Patch0:		%{name}-initializer.patch
 Patch1:		%{name}-versions.patch
 Patch2:		%{name}-unshift.patch
+patch3:		%{name}-porting.patch
+patch4:		%{name}-autotools.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool
 BuildRequires:	perl
@@ -42,6 +44,8 @@ easily converted.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 touch aclocal.m4
 touch Makefile.in
@@ -84,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Mon Jan 23 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.5-2
+- Portability fixes
+
 * Tue Dec 13 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.5-1
 - Update to version 3.5
 - Drop patches implemented upstream