[globus-ftp-client/el5] GT6 update

Mattias Ellert ellert at fedoraproject.org
Mon Oct 27 22:11:27 UTC 2014 

commit bcd0a762b352e47acedbc916d39d3e3669ef0b70
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Oct 27 23:10:45 2014 +0100

    GT6 update
    
    - Drop patches globus-ftp-client-doxygen.patch and globus-ftp-client-deps.patch
      (fixed upstream)

 globus-ftp-client-deps.patch        |   24 --
 globus-ftp-client-doxygen.patch     |  666 -----------------------------------
 globus-ftp-client-undef-macro.patch |   84 +++++
 globus-ftp-client.spec              |   26 +-
 sources                             |    2 +-
 5 files changed, 100 insertions(+), 702 deletions(-)
---
diff --git a/globus-ftp-client-undef-macro.patch b/globus-ftp-client-undef-macro.patch
new file mode 100644
index 0000000..4875848
--- /dev/null
+++ b/globus-ftp-client-undef-macro.patch
@@ -0,0 +1,84 @@
+diff -ur globus_ftp_client-8.13.orig/configure globus_ftp_client-8.13/configure
+--- globus_ftp_client-8.13.orig/configure	2014-09-30 01:10:38.254768042 +0200
++++ globus_ftp_client-8.13/configure	2014-10-26 18:33:27.994865641 +0100
+@@ -652,6 +652,7 @@
+ TARGET_MINGW_TRUE
+ CYGPATH_W_DEFINED_FALSE
+ CYGPATH_W_DEFINED_TRUE
++GLOBUS_TOOLKIT_ID
+ DIRT_BRANCH_ID
+ DIRT_TIMESTAMP
+ CPP
+@@ -11680,6 +11681,24 @@
+ 
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Toolkit version" >&5
++$as_echo_n "checking Toolkit version... " >&6; }
++if test "X$GLOBUS_TOOLKIT_ID" = "X"; then
++    if test "X$GLOBUS_VERSION" = "X"; then
++        if test -x ${GLOBUS_LOCATION-/usr}/bin/globus-version; then
++            GLOBUS_TOOLKIT_ID="`${GLOBUS_LOCATION-/usr}/bin/globus-version -full`"
++        else
++            GLOBUS_TOOLKIT_ID="unknown"
++        fi
++    else
++        GLOBUS_TOOLKIT_ID="Globus Toolkit $GLOBUS_VERSION"
++    fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLOBUS_TOOLKIT_ID" >&5
++$as_echo "$GLOBUS_TOOLKIT_ID" >&6; }
++
++
++
+  if
+     case $host in
+         *mingw32*)
+diff -ur globus_ftp_client-8.13.orig/configure.ac globus_ftp_client-8.13/configure.ac
+--- globus_ftp_client-8.13.orig/configure.ac	2014-09-29 14:42:32.723768042 +0200
++++ globus_ftp_client-8.13/configure.ac	2014-10-26 18:33:27.995865629 +0100
+@@ -14,6 +14,22 @@
+ m4_include([dirt.sh])
+ AC_SUBST(DIRT_TIMESTAMP)
+ AC_SUBST(DIRT_BRANCH_ID)
++
++AC_MSG_CHECKING([Toolkit version])
++if test "X$GLOBUS_TOOLKIT_ID" = "X"; then
++    if test "X$GLOBUS_VERSION" = "X"; then
++        if test -x ${GLOBUS_LOCATION-/usr}/bin/globus-version; then
++            GLOBUS_TOOLKIT_ID="`${GLOBUS_LOCATION-/usr}/bin/globus-version -full`"
++        else
++            GLOBUS_TOOLKIT_ID="unknown"
++        fi
++    else
++        GLOBUS_TOOLKIT_ID="Globus Toolkit $GLOBUS_VERSION"
++    fi
++fi
++AC_MSG_RESULT($GLOBUS_TOOLKIT_ID)
++AC_SUBST(GLOBUS_TOOLKIT_ID)
++
+ AC_CANONICAL_HOST
+ AM_CONDITIONAL([CYGPATH_W_DEFINED], [
+     case $host in
+diff -ur globus_ftp_client-8.13.orig/Makefile.in globus_ftp_client-8.13/Makefile.in
+--- globus_ftp_client-8.13.orig/Makefile.in	2014-09-30 01:10:40.051768042 +0200
++++ globus_ftp_client-8.13/Makefile.in	2014-10-26 18:34:23.177224885 +0100
+@@ -318,6 +318,7 @@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
++GLOBUS_TOOLKIT_ID = @GLOBUS_TOOLKIT_ID@
+ GREP = @GREP@
+ GRIDFTP_SERVER_PATH = @GRIDFTP_SERVER_PATH@
+ GSI_DRIVER_CFLAGS = @GSI_DRIVER_CFLAGS@
+diff -ur globus_ftp_client-8.13.orig/test/Makefile.in globus_ftp_client-8.13/test/Makefile.in
+--- globus_ftp_client-8.13.orig/test/Makefile.in	2014-09-30 01:10:40.374768042 +0200
++++ globus_ftp_client-8.13/test/Makefile.in	2014-10-26 18:34:23.360222760 +0100
+@@ -727,6 +727,7 @@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
++GLOBUS_TOOLKIT_ID = @GLOBUS_TOOLKIT_ID@
+ GREP = @GREP@
+ GRIDFTP_SERVER_PATH = @GRIDFTP_SERVER_PATH@
+ GSI_DRIVER_CFLAGS = @GSI_DRIVER_CFLAGS@
diff --git a/globus-ftp-client.spec b/globus-ftp-client.spec
index 6b74dd7..c27f777 100644
--- a/globus-ftp-client.spec
+++ b/globus-ftp-client.spec
@@ -2,7 +2,7 @@
 
 Name:		globus-ftp-client
 %global _name %(tr - _ <<< %{name})
-Version:	8.12
+Version:	8.13
 Release:	1%{?dist}
 Summary:	Globus Toolkit - GridFTP Client Library
 
@@ -12,10 +12,8 @@ URL:		http://www.globus.org/
 Source:		http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GRIDFTP
-#		Doxygen fixes
-Patch0:		%{name}-doxygen.patch
-#		Missing depensencies
-Patch1:		%{name}-deps.patch
+#		Undefined configure macro
+Patch0:		%{name}-undef-macro.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-xio-popen-driver%{?_isa} >= 2
@@ -30,7 +28,8 @@ BuildRequires:	globus-xio-popen-driver-devel >= 2
 BuildRequires:	openssl-devel
 BuildRequires:	doxygen
 #		Additional requirements for make check
-BuildRequires:	globus-gridftp-server-progs
+BuildRequires:	globus-gridftp-server-devel >= 7
+BuildRequires:	globus-gridftp-server-progs >= 7
 BuildRequires:	openssl
 BuildRequires:	perl(Test::More)
 
@@ -84,15 +83,15 @@ GridFTP Client Library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
-%patch0 -p1
 touch -r configure.ac x
-%patch1 -p1
+%patch0 -p1
 touch -r x configure.ac
 
 %build
 # Reduce overlinking
 export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
 
+export GLOBUS_VERSION=6.0
 %configure --disable-static \
 	   --includedir='${prefix}/include/globus' \
 	   --libexecdir='${datadir}/globus' \
@@ -116,7 +115,7 @@ install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 %check
 # Checks fail in koji for EPEL5 and EPEL6
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
-PATH=$PATH:/usr/sbin make check
+make %{?_smp_mflags} check
 %endif
 
 %clean
@@ -147,6 +146,11 @@ rm -rf %{buildroot}
 %doc %{_pkgdocdir}/html/*
 
 %changelog
+* Sun Oct 26 2014 Mattias Ellert <ellert at ellert.tsl.uu.se> - 8.13-1
+- GT6 update
+- Drop patches globus-ftp-client-doxygen.patch and globus-ftp-client-deps.patch
+  (fixed upstream)
+
 * Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.12-1
 - Update to Globus Toolkit 6.0
 - Drop GPT build system and GPT packaging metadata
@@ -190,7 +194,7 @@ rm -rf %{buildroot}
 
 * Fri Apr 27 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.3-1
 - Update to Globus Toolkit 5.2.1
-- Drop patch globus-ftp-client-deps.patch (fixed upstrem)
+- Drop patch globus-ftp-client-deps.patch (fixed upstream)
 
 * Fri Apr 27 2012 Emmanouil Paisios <paisios at lrz.de> - 7.2-3
 - Added patch from VDT for enabling gridftp v2 via the environment variable
@@ -203,7 +207,7 @@ rm -rf %{buildroot}
 * Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
 - Update to Globus Toolkit 5.2.0
 - Drop patches globus-ftp-client-doxygen.patch, globus-ftp-client-format.patch
-  and globus-ftp-client-type-punned-pointer.patch (fixed upstrem)
+  and globus-ftp-client-type-punned-pointer.patch (fixed upstream)
 
 * Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.0-2
 - Add README file
diff --git a/sources b/sources
index 24c2de0..c481030 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae24033ee8c3a72fce919a283f767c63  globus_ftp_client-8.12.tar.gz
+d32445ed013ab29bb5e96d99206f2221  globus_ftp_client-8.13.tar.gz

More information about the scm-commits mailing list