[globus-gridftp-server/el5] GT6 update

[Mattias Ellert]

commit bb7a521f09c83d8a4225e1dac949adea1ff9d28e
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Oct 27 23:03:29 2014 +0100

    GT6 update
    
    - Drop patch globus-gridftp-server-deps.patch (fixed upstream)

 globus-gridftp-server-deps.patch |   24 ------------------------
 globus-gridftp-server.spec       |   15 +++++++--------
 sources                          |    2 +-
 3 files changed, 8 insertions(+), 33 deletions(-)
---
diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec
index 88b23e7..c17f8a0 100644
--- a/globus-gridftp-server.spec
+++ b/globus-gridftp-server.spec
@@ -6,8 +6,8 @@
 
 Name:		globus-gridftp-server
 %global _name %(tr - _ <<< %{name})
-Version:	7.11
-Release:	2%{?dist}
+Version:	7.12
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GridFTP Server
 
 Group:		System Environment/Libraries
@@ -20,12 +20,10 @@ Source3:	globus-gridftp-password.8
 Source4:	globus-gridftp-server-setup-chroot.8
 #		README file
 Source8:	GLOBUS-GRIDFTP
-#		Missing dependencis
-Patch0:		%{name}-deps.patch
 #		Fix logging of IPv6 addresses
 #		https://ggus.eu/index.php?mode=ticket_info&ticket_id=106665
 #		https://github.com/globus/globus-toolkit/pull/8
-Patch1:		%{name}-ipv6log.patch
+Patch0:		%{name}-ipv6log.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-xio-gsi-driver%{?_isa} >= 2
@@ -101,10 +99,7 @@ Globus GridFTP Server Development Files
 
 %prep
 %setup -q -n %{_name}-%{version}
-touch -r configure.ac x
 %patch0 -p1
-touch -r x configure.ac
-%patch1 -p1
 
 %build
 # Reduce overlinking
@@ -207,6 +202,10 @@ fi
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 27 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.12-1
+- GT6 update
+- Drop patch globus-gridftp-server-deps.patch (fixed upstream)
+
 * Tue Sep 30 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.11-2
 - Fix logging of IPv6 addresses
 
diff --git a/sources b/sources
index 78a1b18..0c6c388 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eb38cbc6d515f1c0e4342f04ae4752a  globus_gridftp_server-7.11.tar.gz
+eac55d235ac1dadfb2240fa5fdd1cd65  globus_gridftp_server-7.12.tar.gz