[globus-common/f19] Add aarch64 to the list of 64 bit platforms
Mattias Ellert
ellert at fedoraproject.org
Fri May 24 13:04:52 UTC 2013
commit 8fa461e7e81ab95cd51e0278c1857dc8965c630d
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Fri May 24 15:04:12 2013 +0200
Add aarch64 to the list of 64 bit platforms
- Don't use AM_CONFIG_HEADER (automake 1.13)
globus-common-ac.patch | 12 ++++++++++++
globus-common.spec | 26 ++++++++------------------
2 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/globus-common-ac.patch b/globus-common-ac.patch
new file mode 100644
index 0000000..ce6dfac
--- /dev/null
+++ b/globus-common-ac.patch
@@ -0,0 +1,12 @@
+diff -ur globus_common-14.9.orig/configure.in globus_common-14.9/configure.in
+--- globus_common-14.9.orig/configure.in 2012-02-13 15:31:55.000000000 +0100
++++ globus_common-14.9/configure.in 2013-02-27 18:35:41.074315780 +0100
+@@ -10,7 +10,7 @@
+ dnl Initialize the automake rules the last argument
+ AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ LAC_THREADS
+
diff --git a/globus-common.spec b/globus-common.spec
index b2e6874..deeb2b3 100644
--- a/globus-common.spec
+++ b/globus-common.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
@@ -9,7 +9,7 @@
Name: globus-common
%global _name %(tr - _ <<< %{name})
Version: 14.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Globus Toolkit - Common Library
Group: System Environment/Libraries
@@ -21,6 +21,7 @@ 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))
@@ -55,11 +56,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)
@@ -159,6 +156,7 @@ 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
@@ -249,11 +247,6 @@ grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
>> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-# 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
-
# Remove deprecated.3 man page (too common name)
rm -f %{buildroot}%{_mandir}/man3/deprecated.3
sed -e '/deprecated\.3/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
@@ -271,15 +264,11 @@ 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
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
@@ -289,17 +278,18 @@ rm -rf %{buildroot}
%doc %{_docdir}/%{name}-%{version}/README
%files -f package-progs.filelist progs
-%defattr(-,root,root,-)
%files -f package-devel.filelist devel
-%defattr(-,root,root,-)
%dir %{_includedir}/globus
%files -f package-doc.filelist doc
-%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 14.9-3
+- 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 at lists.fedoraproject.org> - 14.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list