[uberftp/el5: 25/25] Adapt to Globus Toolkit 6.0

[Mattias Ellert]

commit 99df94404d90197babd7280d25b9e64dc533f982
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Sep 29 11:30:05 2014 +0200

    Adapt to Globus Toolkit 6.0

 .gitignore                     |    4 +---
 uberftp-32bit-pkg-config.patch |   20 ++++++++++++++++----
 uberftp.spec                   |   33 +++++++++------------------------
 3 files changed, 26 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8836bf7..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-uberftp-client-2.5.tar.gz
-uberftp-client-2.6.tar.gz
-/UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518.tar.gz
+/*.tar.gz
diff --git a/uberftp-32bit-pkg-config.patch b/uberftp-32bit-pkg-config.patch
index e1e1b0b..96062e0 100644
--- a/uberftp-32bit-pkg-config.patch
+++ b/uberftp-32bit-pkg-config.patch
@@ -1,12 +1,24 @@
-diff -uNr UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518.ORIG/configure.ac UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518/configure.ac
---- UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518.ORIG/configure.ac	2014-09-08 08:33:49.804000000 +0000
-+++ UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518/configure.ac	2014-09-08 09:14:20.865000000 +0000
+diff -ur UberFTP.orig/configure UberFTP/configure
+--- UberFTP.orig/configure	2014-02-11 19:35:56.000000000 +0100
++++ UberFTP/configure	2014-09-29 10:10:45.282934507 +0200
+@@ -3812,7 +3812,7 @@
+ 
+ if test "x$globus_location" == "x/usr" ; then
+ 	# RPM installation
+-	CPPFLAGS=-I$globus_location/lib64/globus/include
++	CPPFLAGS="-I$globus_location/lib64/globus/include -I$globus_location/lib/globus/include -I$globus_location/include/globus"
+ 	ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+diff -ur UberFTP.orig/configure.ac UberFTP/configure.ac
+--- UberFTP.orig/configure.ac	2014-02-11 19:35:56.000000000 +0100
++++ UberFTP/configure.ac	2014-09-29 10:09:35.848741840 +0200
 @@ -109,7 +109,7 @@
  
  if test "x$globus_location" == "x/usr" ; then
  	# RPM installation
 -	CPPFLAGS=-I$globus_location/lib64/globus/include
-+	CPPFLAGS="-I$globus_location/lib64/globus/include -I$globus_location/lib/globus/include"
++	CPPFLAGS="-I$globus_location/lib64/globus/include -I$globus_location/lib/globus/include -I$globus_location/include/globus"
  	AC_CHECK_HEADERS([globus_config.h],
  	                 [GLOBUS_CONFIG_CPPFLAGS="$CPPFLAGS"], 
  	                 [AC_MSG_ERROR(globus_config.h not found, install globus-core)])
diff --git a/uberftp.spec b/uberftp.spec
index 0d8fc64..4bbc162 100644
--- a/uberftp.spec
+++ b/uberftp.spec
@@ -4,16 +4,9 @@
 %global commit 012788f5430c9f7eb03e65b7aa8bcb106f472518
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64
-%else
-%global flavor gcc32
-%endif
-
 Name:           uberftp
 Version:        2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GridFTP-enabled ftp client
 
 Group:          Applications/Internet
@@ -25,7 +18,7 @@ Source0:        https://github.com/JasonAlt/UberFTP/archive/%{commit}/UberFTP-%{
 Patch0:         uberftp-32bit-pkg-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  grid-packaging-tools, globus-gssapi-gsi-devel
+BuildRequires:  globus-gssapi-gsi-devel
 
 %description
 UberFTP is the first interactive, GridFTP-enabled ftp client. 
@@ -35,38 +28,30 @@ third party transfers.
 %prep
 %setup -q -n UberFTP-%{commit}
 iconv -f iso8859-1 -t utf-8 copyright > copyright.conv && mv -f copyright.conv copyright
+touch -r configure.ac x
 %patch0 -p1
+touch -r x configure.ac
 
 %build
-mkdir pkgdata
-cp -p pkg_data_src.gpt.in pkgdata/.
-
-sed -e 's!-I$globus_location/include/$globus_flavor! -I%{_includedir}/globus -I%{_libdir}/globus/include!' \
-        -i configure.ac
-unset GLOBUS_LOCATION
-unset GPT_LOCATION
-%{_datadir}/globus/globus-bootstrap.sh
-
-%configure  --with-globus-flavor=%{flavor} --with-globus=%{_usr} --with-gpt=%{_usr} 
+%configure --with-globus=%{_usr}
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
-%defattr(-,root,root,-)
 %{_bindir}/uberftp
-%{_mandir}/man1/uberftp.1.gz
+%{_mandir}/man1/uberftp.1*
 %doc Changelog.mssftp Changelog copyright
 
 %changelog
+* Mon Sep 29 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-2
+- Adapt to Globus Toolkit 6.0
+
 * Tue Sep 2 2014 Steve Traylen <steve.traylen at cern.ch> - 2.8-1
 - Upstream to 2.8, upstream has moved to github.
 - Add patch for 32 bit.