[globus-gridftp-server/el5] Update to Globus Toolkit 5.2.3

[Mattias Ellert]

commit 41c12930233fc5972a8935817bd7eef457f2a921
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 15:20:33 2012 +0100

    Update to Globus Toolkit 5.2.3

 globus-gridftp-server.spec |   46 ++++++++++++++++++++++---------------------
 sources                    |    2 +-
 2 files changed, 25 insertions(+), 23 deletions(-)
---
diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec
index 22dcbf0..46849d1 100644
--- a/globus-gridftp-server.spec
+++ b/globus-gridftp-server.spec
@@ -8,14 +8,14 @@
 
 Name:		globus-gridftp-server
 %global _name %(tr - _ <<< %{name})
-Version:	6.14
+Version:	6.16
 Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GridFTP Server
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.2/packages/src/%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.3/packages/src/%{_name}-%{version}.tar.gz
 Source1:	%{name}
 Source2:	globus-gridftp-sshftp
 Source3:	globus-gridftp-password.8
@@ -120,36 +120,36 @@ sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
 
 # Remove libtool archives (.la files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
+find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
 sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
-mv $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.conf.default \
-   $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
-mv $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.xinetd.default \
-   $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/gridftp
-mv $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.gfork.default \
-   $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.gfork
+mv %{buildroot}%{_sysconfdir}/gridftp.conf.default \
+   %{buildroot}%{_sysconfdir}/gridftp.conf
+mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
+mv %{buildroot}%{_sysconfdir}/gridftp.xinetd.default \
+   %{buildroot}%{_sysconfdir}/xinetd.d/gridftp
+mv %{buildroot}%{_sysconfdir}/gridftp.gfork.default \
+   %{buildroot}%{_sysconfdir}/gridftp.gfork
 rm $GLOBUSPACKAGEDIR/%{_name}/pkg_data_noflavor_data.gpt
 rm $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
 
 # No need for environment in conf files
-sed '/ env /d' -i $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.gfork
-sed '/^env /d' -i $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/gridftp
+sed '/ env /d' -i %{buildroot}%{_sysconfdir}/gridftp.gfork
+sed '/^env /d' -i %{buildroot}%{_sysconfdir}/xinetd.d/gridftp
 
 # Remove start-up scripts
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+rm -rf %{buildroot}%{_sysconfdir}/init.d
 sed '/init\.d/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
 
 # Install start-up scripts
-mkdir -p $RPM_BUILD_ROOT%{_initddir}
-install -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_initddir}
+mkdir -p %{buildroot}%{_initddir}
+install -p %{SOURCE1} %{SOURCE2} %{buildroot}%{_initddir}
 
 # Move server man pages to progs package
 grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
@@ -157,11 +157,10 @@ grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Install additional man pages
-install -m 644 -p %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8
+install -m 644 -p %{SOURCE3} %{SOURCE4} %{buildroot}%{_mandir}/man8
 
 # Install README file
-install -m 644 -p %{SOURCE8} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
@@ -174,7 +173,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -218,6 +217,9 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.16-1
+- Update to Globus Toolkit 5.2.3
+
 * Sun Jul 22 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.14-1
 - Update to Globus Toolkit 5.2.2
 - Drop patch globus-gridftp-server-pw195.patch (was backport)
diff --git a/sources b/sources
index e76b7f6..230f91d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bb5367bada7bd66848d3645d532d344  globus_gridftp_server-6.14.tar.gz
+1a0db54eeee18b5acc687eacf5b720f8  globus_gridftp_server-6.16.tar.gz