From 53b16c5ac8482759b6c4bfe02bf8a2d3f5adbe3c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 1 Apr 2011 09:12:47 -0600
Subject: [PATCH] Update to 6.0.0-beta Enable cairo and gdal support

---
 .gitignore               |  1 +
 Site.local.ncl           | 10 ++++++----
 ncl-5.1.0-includes.patch | 10 ----------
 ncl.spec                 | 16 ++++++++++++----
 sources                  |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 516cd44..7a6c593 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ncl_ncarg_src-5.2.0.tar.gz
 ncl_ncarg_src-5.2.1.tar.gz
+/ncl_ncarg-6.0.0-beta.tar.gz
diff --git a/Site.local.ncl b/Site.local.ncl
index 897a534..b89bef6 100644
--- a/Site.local.ncl
+++ b/Site.local.ncl
@@ -4,18 +4,20 @@
 #define SharePath $(DESTDIR)@datadir@
 
 #define BuildWithF90 TRUE
-#define IncSearch -I/usr/include/netcdf -I/usr/include/udunits2
+#define IncSearch -I/usr/include/netcdf -I/usr/include/udunits2 -I/usr/include/freetype2 -I/usr/include/gdal
 #define LibSearch -L@libdir@/hdf
 
 #define BuildNetCDF4 1
 #define NetCDF4lib -lnetcdf
-#define BuildV5D 0
+#define BuildCAIRO 1
+#define CAIROlib -lcairo -lfreetype
+#define BuildGDAL 1
+#define GDALlib -lgdal
 #define BuildHDFEOS 0
 #define BuildHDFEOS5 0
 #define BuildTRIANGLE 0
-#define V5Dlib
 #define BuildDODS 1
 #define HDFlib -lmfhdf -ldf -ljpeg -lz
+#define HDF5lib -lhdf5_hl -lhdf5
 #define BuildUdunits 1
 #define UdUnitslib -ludunits2
-
diff --git a/ncl-5.1.0-includes.patch b/ncl-5.1.0-includes.patch
index cd9f072..98b65bb 100644
--- a/ncl-5.1.0-includes.patch
+++ b/ncl-5.1.0-includes.patch
@@ -1,13 +1,3 @@
---- ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c.includes	2000-08-21 22:03:31.000000000 -0600
-+++ ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c	2008-03-21 11:01:12.000000000 -0600
-@@ -33,6 +33,7 @@
-  *		of 4.
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- 
- bcopyswap(b1, b2, size)
- 	char	*b1;
 --- ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c.includes	2000-08-21 22:04:15.000000000 -0600
 +++ ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c	2008-03-21 11:02:16.000000000 -0600
 @@ -41,6 +41,7 @@
diff --git a/ncl.spec b/ncl.spec
index a2787d1..d055dbf 100644
--- a/ncl.spec
+++ b/ncl.spec
@@ -1,13 +1,13 @@
 Name:           ncl
-Version:        5.2.1
-Release:        6%{?dist}
+Version:        6.0.0
+Release:        0.1.beta%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
 License:        BSD
 URL:            http://www.ncl.ucar.edu
 # You must register for a free account at http://esg.ucar.edu/ before being able to download the source.
-Source0:        ncl_ncarg_src-%{version}.tar.gz
+Source0:        ncl_ncarg-%{version}-beta.tar.gz
 Source1:        Site.local.ncl
 Source2:        ncarg.csh
 Source3:        ncarg.sh
@@ -47,6 +47,8 @@ Patch16:        ncl-5.2.1-secondary.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel
+BuildRequires:  cairo-devel
+BuildRequires:  gdal-devel
 BuildRequires:  hdf-static, hdf-devel >= 4.2r2, libjpeg-devel
 BuildRequires:  g2clib-static, librx-devel, atlas-devel
 # imake needed for makedepend
@@ -119,7 +121,7 @@ Example programs and data using NCL.
 
 
 %prep
-%setup -q -n ncl_ncarg-%{version}
+%setup -q -n ncl_ncarg-%{version}-beta
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .deps
 %patch2 -p1 -b .ppc64
@@ -304,9 +306,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ncarg/libcgm.a
 %{_libdir}/ncarg/libfftpack5_dp.a
 %{_libdir}/ncarg/libhlu.a
+%{_libdir}/ncarg/libhlu_cairo.a
 %{_libdir}/ncarg/libncarg.a
 %{_libdir}/ncarg/libncarg_c.a
 %{_libdir}/ncarg/libncarg_gks.a
+%{_libdir}/ncarg/libncarg_gks_cairo.a
 %{_libdir}/ncarg/libncarg_ras.a
 %{_libdir}/ncarg/libncl.a
 %{_libdir}/ncarg/libnclapi.a
@@ -337,6 +341,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 31 2011 - Orion Poplawski <orion@cora.nwra.com> - 6.0.0-0.1.beta
+- Update to 6.0.0-beta
+- Enable cairo and gdal support
+
 * Fri Feb 18 2011 - Orion Poplawski <orion@cora.nwra.com> - 5.2.1-6
 - Rebuild for new g2clib - fix grib handling on 64-bit machines
 
diff --git a/sources b/sources
index 69149cd..b847f21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7ba4847961f38bbbac30ac042eab43a  ncl_ncarg_src-5.2.1.tar.gz
+681e1664257103f67aec8495463c894c  ncl_ncarg-6.0.0-beta.tar.gz