[globus-common/el5: 6/6] Update to Globus Toolkit 5.2.5

[Mattias Ellert]

commit a6cdfed1e83ae0e9cc8f0236c5a137608ade4ecf
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Wed Nov 6 21:47:06 2013 +0100

    Update to Globus Toolkit 5.2.5
    
    - Drop patch globus-common-ac.patch (accepted upstream)
    - Remove obsolete workaround for broken RHEL 5 epstopdf

 .gitignore             |    1 -
 globus-common-ac.patch |   12 ------------
 globus-common.spec     |   31 +++++++++----------------------
 sources                |    3 +--
 4 files changed, 10 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 943fe53..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/epstopdf-2.9.5gw
 /*.tar.gz
diff --git a/globus-common.spec b/globus-common.spec
index e0c8bd8..b096ef3 100644
--- a/globus-common.spec
+++ b/globus-common.spec
@@ -10,20 +10,16 @@
 
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
-Version:	14.9
-Release:	6%{?dist}
+Version:	14.10
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.3/packages/src/%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.5/packages/src/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-CCOMMONLIB
-#		This is a workaround for the broken epstopdf script in RHEL5
-#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source9:	epstopdf-2.9.5gw
-Patch0:		%{name}-ac.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -158,7 +154,6 @@ Common Library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
-%patch0 -p1
 
 # custom perl requires that removes dependency on gpt perl modules
 cat << EOF > %{name}-req
@@ -169,16 +164,7 @@ EOF
 %global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
-%if "%{rhel}" == "5"
-mkdir bin
-install %{SOURCE9} bin/epstopdf
-%endif
-
 %build
-%if "%{rhel}" == "5"
-export PATH=$PWD/bin:$PATH
-%endif
-
 # Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
@@ -190,7 +176,7 @@ unset GLOBUS_LOCATION
 unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
-export GLOBUS_VERSION=5.2.3
+export GLOBUS_VERSION=5.2.5
 %configure --disable-static --with-flavor=%{flavor} \
 	   --enable-doxygen --with-docdir=%{_pkgdocdir} \
 	   --with-backward-compatibility-hack
@@ -201,10 +187,6 @@ sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 make %{?_smp_mflags}
 
 %install
-%if "%{rhel}" == "5"
-export PATH=$PWD/bin:$PATH
-%endif
-
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
@@ -291,6 +273,11 @@ rm -rf %{buildroot}
 %dir %{_pkgdocdir}/html
 
 %changelog
+* Wed Nov 06 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 14.10-1
+- Update to Globus Toolkit 5.2.5
+- Drop patch globus-common-ac.patch (accepted upstream)
+- Remove obsolete workaround for broken RHEL 5 epstopdf
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index e2ca1f8..98a6c7c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7e732c9920ccbe10cfe0f672d09e6c45  globus_common-14.9.tar.gz
+31eb7a502c113af810b78ecd83e90ff1  globus_common-14.10.tar.gz