[ncl/f14/master] - Recognize Fedora secondary architectures

[Dan Horák]

commit 8f8e883c9c9b355a3911536e6076323a523df7ba
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 6 16:50:29 2010 +0200

    - Recognize Fedora secondary architectures

 ncl-5.2.1-secondary.patch |   13 +++++++++++++
 ncl.spec                  |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/ncl-5.2.1-secondary.patch b/ncl-5.2.1-secondary.patch
new file mode 100644
index 0000000..7ffffd7
--- /dev/null
+++ b/ncl-5.2.1-secondary.patch
@@ -0,0 +1,13 @@
+diff -up ncl_ncarg-5.2.1/config/ymake.secondary ncl_ncarg-5.2.1/config/ymake
+--- ncl_ncarg-5.2.1/config/ymake.secondary	2010-09-06 10:16:02.587814170 -0400
++++ ncl_ncarg-5.2.1/config/ymake	2010-09-06 10:38:59.887472612 -0400
+@@ -373,6 +373,9 @@ case    Linux:
+         case    i*64:
+         case    x*64:
+         case    ppc*:
++        case    s390*:
++        case    sparc*:
++        case    arm*:
+         case    alpha:
+             set model   = $mach
+             set arch    = $mach
diff --git a/ncl.spec b/ncl.spec
index 507c587..4dfaf67 100644
--- a/ncl.spec
+++ b/ncl.spec
@@ -1,6 +1,6 @@
 Name:           ncl
 Version:        5.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
@@ -42,6 +42,8 @@ Patch12:        ncl-5.1.0-netcdff.patch
 Patch13:        ncl-5.1.0-includes.patch
 # Use /etc/udunits.dat
 Patch15:        ncl-5.2.1-udunits.patch
+# Add Fedora secondary arches
+Patch16:        ncl-5.2.1-secondary.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel
@@ -125,6 +127,7 @@ Example programs and data using NCL.
 %patch12 -p1 -b .netcdff
 %patch13 -p1 -b .includes
 %patch15 -p1 -b .udunits
+%patch16 -p1 -b .secondary
 #Spurrious exec permissions
 find -name '*.[fh]' -exec chmod -x {} +
 
@@ -310,6 +313,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 6 2010 - Dan Horák <dan[at]danny.cz> - 5.2.1-2
+- Recognize Fedora secondary architectures
+
 * Tue Aug 10 2010 - Orion Poplawski <orion at cora.nwra.com> - 5.2.1-1
 - Update to 5.2.1
 - Update udunits patch