From e4cc83d45b5f7145079d5bb962db065c5225f48b Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: May 25 2013 06:56:12 +0000
Subject: Add aarch64 to the list of 64 bit platforms


- Don't use AM_CONFIG_HEADER (automake 1.13)

---

diff --git a/globus-xio-ac.patch b/globus-xio-ac.patch
new file mode 100644
index 0000000..0bb7af7
--- /dev/null
+++ b/globus-xio-ac.patch
@@ -0,0 +1,24 @@
+diff -ur globus_xio-3.3.orig/configure.in globus_xio-3.3/configure.in
+--- globus_xio-3.3.orig/configure.in	2013-02-05 15:39:37.000000000 +0100
++++ globus_xio-3.3/configure.in	2013-02-27 18:47:23.267332324 +0100
+@@ -57,7 +57,7 @@
+             "*.doc", 
+             "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CHECK_FUNCS(sysconf)
+ 
+ GLOBUS_FINALIZE
+diff -ur globus_xio-3.3.orig/configure.in.in globus_xio-3.3/configure.in.in
+--- globus_xio-3.3.orig/configure.in.in	2011-02-03 22:53:09.000000000 +0100
++++ globus_xio-3.3/configure.in.in	2013-02-27 18:47:04.993559218 +0100
+@@ -57,7 +57,7 @@
+             "*.doc", 
+             "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CHECK_FUNCS(sysconf)
+ 
+ GLOBUS_FINALIZE
diff --git a/globus-xio.spec b/globus-xio.spec
index 7bda874..2f8c098 100644
--- a/globus-xio.spec
+++ b/globus-xio.spec
@@ -1,4 +1,4 @@
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%ifarch aarch64 alpha ia64 ppc64 s390x sparc64 x86_64
 %global flavor gcc64
 %else
 %global flavor gcc32
@@ -7,7 +7,7 @@
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	3.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -19,6 +19,7 @@ Source8:	GLOBUS-XIO
 #		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:	globus-common%{?_isa} >= 14
@@ -31,11 +32,7 @@ BuildRequires:	graphviz
 BuildRequires:	graphviz-gd
 %endif
 BuildRequires:	ghostscript
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	tex(latex)
-%else
-BuildRequires:	tetex-latex
-%endif
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
 BuildRequires:	tex(fullpage.sty)
 BuildRequires:	tex(multirow.sty)
@@ -94,6 +91,7 @@ Globus XIO Framework Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -149,11 +147,6 @@ for f in %{buildroot}%{_mandir}/man3/globus_xio_driver.3 \
   sed 's/P\.RS/P\n.RS/' -i $f
 done
 
-# Remove unwanted documentation (needed for RHEL4)
-rm -f %{buildroot}%{_mandir}/man3/*_%{_name}-%{version}_*.3
-sed -e '/_%{_name}-%{version}_.*\.3/d' \
-  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
 # Install README file
 install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
 
@@ -165,27 +158,25 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f package.filelist
-%defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/README
 
 %files -f package-devel.filelist devel
-%defattr(-,root,root,-)
 
 %files -f package-doc.filelist doc
-%defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue May 21 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 3.3-5
+- Add aarch64 to the list of 64 bit platforms
+- Don't use AM_CONFIG_HEADER (automake 1.13)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild