rpms/ncl/EL-5 import.log, NONE, 1.1 ncarg.csh, NONE, 1.1 ncarg.sh, NONE, 1.1 ncl-5.0.0-udunits.patch, NONE, 1.1 ncl-5.1.0-includes.patch, NONE, 1.1 ncl-5.1.0-netcdff.patch, NONE, 1.1 ncl-5.1.0-paths.patch, NONE, 1.1 ncl-5.1.0-ppc64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 Site.local.ncl, 1.1, 1.2 ncl-5.0.0-atlas.patch, 1.1, 1.2 ncl.spec, 1.1, 1.2 sources, 1.2, 1.3 ncarg-4.4.2-ppc64.patch, 1.1, NONE ncl-5.0.0-flex.patch, 1.1, NONE ncl-5.0.0-hdf.patch, 1.1, NONE ncl-5.0.0-netcdff.patch, 1.1, NONE ncl-5.0.0-paths.patch, 1.1, NONE ncl-5.0.0-png.patch, 1.1, NONE ncl-5.0.0-triangle.patch, 1.1, NONE ncl-5.0.0-wrapit.patch, 1.1, NONE

Orion Poplawski orion at fedoraproject.org
Tue Sep 22 17:41:29 UTC 2009


Author: orion

Update of /cvs/pkgs/rpms/ncl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1784/EL-5

Modified Files:
	.cvsignore Site.local.ncl ncl-5.0.0-atlas.patch ncl.spec 
	sources 
Added Files:
	import.log ncarg.csh ncarg.sh ncl-5.0.0-udunits.patch 
	ncl-5.1.0-includes.patch ncl-5.1.0-netcdff.patch 
	ncl-5.1.0-paths.patch ncl-5.1.0-ppc64.patch 
Removed Files:
	ncarg-4.4.2-ppc64.patch ncl-5.0.0-flex.patch 
	ncl-5.0.0-hdf.patch ncl-5.0.0-netcdff.patch 
	ncl-5.0.0-paths.patch ncl-5.0.0-png.patch 
	ncl-5.0.0-triangle.patch ncl-5.0.0-wrapit.patch 
Log Message:
Sync from devel - 5.1.1


--- NEW FILE import.log ---
ncl-5_1_1-3_fc12:EL-5:ncl-5.1.1-3.fc12.src.rpm:1253641252


--- NEW FILE ncarg.csh ---
setenv NCARG_ROOT /usr
setenv NCARG_LIB /usr/@LIB@/ncarg
setenv NCARG_DATABASE /usr/@LIB@/ncarg/database
setenv NCARG_FONTCAPS /usr/@LIB@/ncarg/fontcaps
setenv NCARG_GRAPHCAPS /usr/@LIB@/ncarg/graphcaps
setenv NCARG_NCARG /usr/share/ncarg


--- NEW FILE ncarg.sh ---
export NCARG_ROOT=/usr
export NCARG_LIB=/usr/@LIB@/ncarg
export NCARG_DATABASE=/usr/@LIB@/ncarg/database
export NCARG_FONTCAPS=/usr/@LIB@/ncarg/fontcaps
export NCARG_GRAPHCAPS=/usr/@LIB@/ncarg/graphcaps
export NCARG_NCARG=/usr/share/ncarg

ncl-5.0.0-udunits.patch:
 Project |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ncl-5.0.0-udunits.patch ---
--- ncl_ncarg-5.0.0/config/Project.udunits	2008-12-08 15:35:46.000000000 -0700
+++ ncl_ncarg-5.0.0/config/Project	2008-12-08 15:50:44.000000000 -0700
@@ -328,7 +328,7 @@
 		"graphcaps",NULL,"ncarg",NULL,NULL,		\
 		"colormaps",NULL,"ncarg",NULL,NULL,		\
 		"rangs","NCARG_RANGS","database",NULL,NULL,	\
-		"udunits","UDUNITS_PATH","ncarg",NULL,NULL,	\
+		"udunits","UDUNITS_PATH",NULL,"/etc","udunits.dat",	\
 		"psadilookup","PSADILOOKUP_PATH",NULL,NULL,NULL,\
 		"examples",NULL,"ncarg",NULL,NULL,		\
 		"hluex",NULL,"ncarg",NULL,NULL,			\

ncl-5.1.0-includes.patch:
 common/src/bin/ncargpath/ncargpath.c      |    1 
 common/src/libncarg_c/bcopyswap.c         |    1 
 ncarg2d/src/libncarg/areasC/c_argeti.c    |    1 
 ncarg2d/src/libncarg/ncargC.h             |    6 ++
 ncarg2d/src/libncarg/plotchar/bofred.c    |    4 +
 ncarview/src/lib/libctrans/buffer.c       |    4 -
 ncarview/src/lib/libctrans/buffer.h       |   37 +++++++++++++++
 ncarview/src/lib/libctrans/default.c      |   12 ++---
 ncarview/src/lib/libctrans/default.h      |   70 ++++++++++++++++++++++++++++++
 ncarview/src/lib/libctrans/gcaprast.c     |    6 +-
 ncarview/src/lib/libctrans/in.h           |    4 +
 ncarview/src/lib/libctrans/misc.c         |    2 
 ncarview/src/lib/libctrans/misc.h         |   31 +++++++++++++
 ncarview/src/lib/libctrans/rast.c         |   10 ++--
 ncarview/src/lib/libncarg_ras/misc.c      |    3 +
 ncarview/src/lib/libncarg_ras/misc.h      |   41 +++++++++++++++++
 ncarview/src/lib/libncarg_ras/raster.c    |    2 
 ncarview/src/lib/libncarg_ras/sunraster.c |   10 ++--
 18 files changed, 225 insertions(+), 20 deletions(-)

--- NEW FILE ncl-5.1.0-includes.patch ---
--- 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 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ncarg/c.h>
 
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c.includes	2000-08-22 09:05:20.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c	2008-03-21 11:04:17.000000000 -0600
@@ -25,6 +25,10 @@
 ************************************************************************/
 
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <ncarg/c.h>
 
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c.includes	2000-08-22 09:02:06.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c	2008-03-21 11:05:46.000000000 -0600
@@ -24,6 +24,7 @@
 *                                                                       *
 ************************************************************************/
 
+#include <string.h>
 #include <ncarg/ncargC.h>
 
 extern void NGCALLF(argeti,ARGETI)(NGstring,int*,int);
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h.includes	2008-03-21 11:10:43.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h	2008-03-21 11:10:25.000000000 -0600
@@ -176,6 +176,12 @@
 #endif
 );
 
+extern void NGCALLF(agback,AGBACK)(
+#ifdef  NeedFuncProto
+    void
+#endif
+);
+
 extern char *c_agbnch(
 #ifdef  NeedFuncProto
     int idsh
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/raster.c.includes	2000-08-22 09:12:16.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/raster.c	2008-04-10 14:53:26.000000000 -0600
@@ -48,6 +48,7 @@
  *		
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -518,6 +519,7 @@
  *		RAS_ERROR or RAS_EOF if something went wrong.
  *		
  *********************************************************************/
+int
 RasterLoadPalette(ras, colors)
 	Raster		*ras;
 	unsigned char	colors[768];
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.c.includes	2000-08-22 09:12:12.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.c	2008-04-10 14:57:14.000000000 -0600
@@ -71,6 +71,7 @@
 
 /* Swiped from John Clyne */
 
+void
 _swapshort (bp, n)
     register char *bp;
     register unsigned n;
@@ -86,6 +87,7 @@
     }
 }
 
+void
 _swaplong (bp, n)
     register char *bp;
     register unsigned n;
@@ -112,6 +114,7 @@
  *
  *	Return the number of images in a file. Return -1 on error
  */
+int
 ImageCount_(name, format)
 	char	*name;
 	char	*format;
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.h.includes	2008-04-10 14:57:41.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.h	2008-04-10 15:00:16.000000000 -0600
@@ -0,0 +1,41 @@
+/*
+ *	$Id$
+ */
+/************************************************************************
+*                                                                       *
+*                Copyright (C)  2000                                    *
+*        University Corporation for Atmospheric Research                *
+*                All Rights Reserved                                    *
+*                                                                       *
+* This file is free software; you can redistribute it and/or modify     *
+* it under the terms of the GNU General Public License as published     *
+* by the Free Software Foundation; either version 2 of the License, or  *
+* (at your option) any later version.                                   *
+*                                                                       *
+* This software is distributed in the hope that it will be useful, but  *
+* WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+* General Public License for more details.                              *
+*                                                                       *
+* You should have received a copy of the GNU General Public License     *
+* along with this software; if not, write to the Free Software         *
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307   *
+* USA.                                                                  *
+*                                                                       *
+************************************************************************/
+
+/***********************************************************************
+*                                                                      *
+*                          Copyright (C)  1991                         *
+*            University Corporation for Atmospheric Research           *
+*                          All Rights Reserved                         *
+*                                                                      *
+*                                                                      *
+***********************************************************************/
+/*	File:	misc.h
+ */
+
+int read_swap(FILE *fp, int nb, char *buf, int swapflag);
+void _swapshort (register char *bp, register unsigned n);
+void _swaplong (register char *bp, register unsigned n);
+int ImageCount_(char *name, char *format);
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.c.includes	2008-04-10 15:29:16.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.c	2008-04-10 15:28:57.000000000 -0600
@@ -76,7 +76,7 @@
 /*
  *	Flushes out the output buffer. Called at the end of a picture.
  */
-flush()
+void	flush()
 {
 	(void)write(outFD,outbuf,outbufnum);
 	outbufnum = 0;
@@ -86,7 +86,7 @@
  *	Copies the "count" number of chars from "str" into the output buffer,
  *	flushing the buffer if need be.
  */
-buffer(str,count)
+void	buffer(str,count)
 	SignedChar 	*str;
 	int  		count;
 {
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.h.includes	2008-04-10 15:29:29.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.h	2008-04-10 15:31:08.000000000 -0600
@@ -0,0 +1,37 @@
+/*
+ *	$Id$
+ */
+/************************************************************************
+*                                                                       *
+* This file is free software; you can redistribute it and/or modify     *
+* it under the terms of the GNU General Public License as published     *
+* by the Free Software Foundation; either version 2 of the License, or  *
+* (at your option) any later version.                                   *
+*                                                                       *
+* This software is distributed in the hope that it will be useful, but  *
+* WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+* General Public License for more details.                              *
+*                                                                       *
+* You should have received a copy of the GNU General Public License     *
+* along with this software; if not, write to the Free Software         *
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307   *
+* USA.                                                                  *
+*                                                                       *
+************************************************************************/
+
+/***********************************************************************
+*                                                                      *
+*                          Copyright (C)  1990                         *
+*            University Corporation for Atmospheric Research           *
+*                          All Rights Reserved                         *
+*                                                                      *
+*                      NCAR View V3.01 - UNIX Release                  *
+*                                                                      *
+***********************************************************************/
+
+#include "ctrandef.h"
+
+int	GcapOpenBuffer(char *file);
+void	flush(void);
+void	buffer(SignedChar *str, int count);
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.c.includes	2000-08-22 09:11:45.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.c	2008-04-10 15:15:45.000000000 -0600
@@ -99,7 +99,7 @@
 
 
 
-InitDefault()
+void	InitDefault()
 {
 	static	boolean	isInit = FALSE;
 	int	max_intensity = (1 << DCP) - 1;
@@ -173,7 +173,7 @@
 	colorLUTable.damage = FALSE;
 }
 
-SetInPic(value)
+void	 SetInPic(value)
 boolean		value;
 {
 	int	i;
@@ -1290,7 +1290,7 @@
 /*
  *	set mininum line width
  */
-SetMinLineWidthDefault(line_width)
+void SetMinLineWidthDefault(line_width)
 	float	line_width;
 {
 
@@ -1315,7 +1315,7 @@
 /*
  *	Set Maximum line width.
  */
-SetMaxLineWidthDefault(line_width)
+void SetMaxLineWidthDefault(line_width)
 	float	line_width;
 {
 	defaulttable.line_width = MIN(line_width, defaulttable.line_width);
@@ -1330,7 +1330,7 @@
 /*
  *	set additional line scaling
  */
-SetAdditionalLineScale(line_scale)
+void SetAdditionalLineScale(line_scale)
 	float	line_scale;
 {
 	LINE_WIDTH_DAMAGE = TRUE;
@@ -1344,7 +1344,7 @@
 /*
  *	set rgb intensity scaling
  */
-SetRGBIntensityScale(rgb_scale)
+void SetRGBIntensityScale(rgb_scale)
 	float	rgb_scale;
 {
 	COLOUR_TABLE_DAMAGE = TRUE;
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.h.includes	2000-08-21 21:30:26.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.h	2008-04-10 15:26:23.000000000 -0600
@@ -454,3 +454,73 @@
 #define	COLOUR_INDEX_RED(I)	(clut->ce[(I)].rgb.red)
 #define	COLOUR_INDEX_GREEN(I)	(clut->ce[(I)].rgb.green)
 #define	COLOUR_INDEX_BLUE(I)	(clut->ce[(I)].rgb.blue)
+
+void	InitDefault(void);
+void	_CtDefNoColorDefault(void);
+void	 SetInPic(boolean  value);
+int MFVersion(CGMC *c);
+int MFDesc(CGMC *c);
+int VDCType(CGMC *c);
+int IntergerPrec(CGMC *c);
+int RealPrec(CGMC *c);
+int IndexPrec(CGMC *c);
+int ColrPrec(CGMC *c);
+int ColrIndexPrec(CGMC *c);
+int MaxColrIndex(CGMC *c);
+int ColrValueExt(CGMC *c);
+int MFElemList(CGMC *c);
+int MFDefaults(CGMC *c);
+int CharSetList(CGMC *c);
+int CharCoding(CGMC *c);
+int ScaleMode(CGMC *c);
+int ColrMode(CGMC *c);
+int LineWidthMode(CGMC *c);
+int MarkerSizeMode(CGMC *c);
+int EdgeWidthMode(CGMC *c);
+int VDCExt(CGMC *c);
+int BackColr(CGMC *c);
+int VDCIntergerPrec(CGMC *c);
+int VDCRealPrec(CGMC *c);
+int AuxColr(CGMC *c);
+int Transparency(CGMC *c);
+int ClipRect(CGMC *c);
+int Clip(CGMC *c);
+int LineIndex(CGMC *c);
+int LineType(CGMC *c);
+int LineWidth(CGMC *c);
+int LineColr(CGMC *c);
+int MarkerIndex(CGMC *c);
+int MarkerType(CGMC *c);
+int MarkerSize(CGMC *c);
+int MarkerColr(CGMC *c);
+int TextIndex(CGMC *c);
+int TextFontIndex(CGMC *c);
+int TextPrec(CGMC *c);
+int CharExpan(CGMC *c);
+int CharSpace(CGMC *c);
+int TextColr(CGMC *c);
+int CharHeight(CGMC *c);
+int CharOri(CGMC *c);
+int TextPath(CGMC *c);
+int TextAlign(CGMC *c);
+int CharSetIndex(CGMC *c);
+int AltCharSetIndex(CGMC *c);
+int FillIndex(CGMC *c);
+int IntStyle(CGMC *c);
+int FillColr(CGMC *c);
+int HatchIndex(CGMC *c);
+int PatIndex(CGMC *c);
+int EdgeIndex(CGMC *c);
+int EdgeType(CGMC *c);
+int EdgeWidth(CGMC *c);
+int EdgeColr(CGMC *c);
+int EdgeVis(CGMC *c);
+int FillRefPt(CGMC *c);
+int PatTable(CGMC *c);
+int PatSize(CGMC *c);
+int ColrTable(CGMC *c);
+int ASF(CGMC *c);
+void SetMinLineWidthDefault(float line_width);
+void SetMaxLineWidthDefault(float line_width);
+void SetAdditionalLineScale(float line_scale);
+void SetRGBIntensityScale(float rgb_scale);
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/gcaprast.c.includes	2000-08-22 09:11:48.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/gcaprast.c	2008-04-10 15:32:49.000000000 -0600
@@ -44,6 +44,7 @@
 
 #include	<stdio.h>
 #include	<stdlib.h>
+#include	<string.h>
 #include	<errno.h>
 #include	<ncarg/c.h>
 #include	"cgmc.h"
@@ -52,9 +53,8 @@
 #include	"ctrandef.h"
 #include	"translate.h"
 #include	"bitops.h"
-
-
-
+#include	"buffer.h"
+#include	"format.h"
 
 static	boolean	Runlength;	/* true if device wants run length encoded
 				 * pixel map
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/in.h.includes	2008-04-10 15:08:11.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/in.h	2008-04-10 15:08:42.000000000 -0600
@@ -29,6 +29,9 @@
 *                      NCAR View V3.00 - UNIX Release                  *
 *                                                                      *
 ***********************************************************************/
+
+#include "cgmc.h"
+
 #define	BUFSIZE 	1440	/*size of CGM buffer in bytes	*/
 #define N 		-1	/*flag indicating any integer value	*/
 #define STDIN		0
@@ -72,4 +75,5 @@
 				 */
          };
 
+int Instr_Dec(CGMC *cgmc);
 
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.c.includes	2000-08-22 09:11:50.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.c	2008-04-10 15:09:55.000000000 -0600
@@ -36,7 +36,7 @@
  *	Description:	miscellaneous ctrans funcions
  */
 
-CoordStringToInt(s, llx, lly, urx, ury)
+int CoordStringToInt(s, llx, lly, urx, ury)
 	char	*s;
 	int	*llx, *lly, *urx, *ury;
 {
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.h.includes	2008-04-10 15:10:15.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.h	2008-04-10 15:11:11.000000000 -0600
@@ -0,0 +1,31 @@
+/*
+ *      $Id$
+ */
+/************************************************************************
+*                                                                       *
+*                          Copyright (C)  1992                          *
+*            University Corporation for Atmospheric Research            *
+*                          All Rights Reserved                          *
+*                                                                       *
+* This file is free software; you can redistribute it and/or modify     *
+* it under the terms of the GNU General Public License as published     *
+* by the Free Software Foundation; either version 2 of the License, or  *
+* (at your option) any later version.                                   *
+*                                                                       *
+* This software is distributed in the hope that it will be useful, but  *
+* WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+* General Public License for more details.                              *
+*                                                                       *
+* You should have received a copy of the GNU General Public License     *
+* along with this software; if not, write to the Free Software         *
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307   *
+* USA.                                                                  *
+*                                                                       *
+************************************************************************/
+
+/*
+ *	File:		misc.h
+ */
+
+int CoordStringToInt(char *s, int *llx, int *lly, int *urx, int *ury);
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/rast.c.includes	2005-08-03 15:14:16.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/rast.c	2008-04-10 16:02:40.000000000 -0600
@@ -30,6 +30,7 @@
 *                                                                      *
 ***********************************************************************/
 		
+#include "in.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -44,6 +45,7 @@
 #include "ctrandef.h"
 #include "default.h"
 #include "devices.h"
+#include "misc.h"
 
 extern	boolean	*softFill;
 extern	boolean	deviceIsInit;
@@ -104,7 +106,7 @@
 Raster	*rastGrid;		/* struct for creating output file	*/
 boolean	rasIsDirect;		/* direct encoded image?		*/
 
-static	build_ras_arg(ras_argc, ras_argv, rast_opts)
+static	int build_ras_arg(ras_argc, ras_argv, rast_opts)
 	int	*ras_argc;
 	char	**ras_argv;
 	struct	Opts rast_opts;
@@ -166,7 +168,7 @@
 }
 
 
-static	clear_grid(grid)
+static	void clear_grid(grid)
 	Raster	*grid;
 {
 	if (rasIsDirect) {
@@ -184,7 +186,7 @@
 	}
 }
 
-static	init_color_tab()
+static	void init_color_tab()
 {
 
 	/*
@@ -198,7 +200,7 @@
 	
 #define DEFAULT_WIDTH   512	/* default raster width         */
 #define DEFAULT_HEIGHT  512	/* default raster height        */
-get_resolution(dev_extent, opts, name)
+void get_resolution(dev_extent, opts, name)
 	CoordRect	*dev_extent;
 	struct	Opts opts;
 	char	*name;
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.c.includes	2000-08-22 09:12:19.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.c	2008-04-10 17:02:27.000000000 -0600
@@ -59,8 +59,10 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "ncarg_ras.h"
 #include "sunraster.h"
+#include "misc.h"
 
 static char	*FormatName = "sun";
 
@@ -235,18 +237,18 @@
 		dep = (SunInfo *) ras->dep;
 	}
 
-	nb = write(ras->fd, (char *) dep, sizeof(SunInfo));
+	nb = write(ras->fd, dep, sizeof(SunInfo));
 	if (nb != sizeof(SunInfo)) return(RAS_EOF);
 
 	/* Write the color table. */
 
-	nb = write(ras->fd, (char *) ras->red, ras->ncolor);
+	nb = write(ras->fd, ras->red, ras->ncolor);
 	if (nb != ras->ncolor) return(RAS_EOF);
 
-	nb = write(ras->fd, (char *) ras->green, ras->ncolor);
+	nb = write(ras->fd, ras->green, ras->ncolor);
 	if (nb != ras->ncolor) return(RAS_EOF);
 
-	nb = write(ras->fd, (char *) ras->blue, ras->ncolor);
+	nb = write(ras->fd, ras->blue, ras->ncolor);
 	if (nb != ras->ncolor) return(RAS_EOF);
 
 	/*

ncl-5.1.0-netcdff.patch:
 nhlf77.csh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ncl-5.1.0-netcdff.patch ---
--- ncl_ncarg-5.1.0/ni/src/scripts/nhlf77.csh.orig	2008-02-06 17:22:03.000000000 -0700
+++ ncl_ncarg-5.1.0/ni/src/scripts/nhlf77.csh	2009-03-05 12:02:11.000000000 -0700
@@ -65,7 +65,7 @@
 
   case "-netcdf":
   case "-cdf":
-    set extra_libs = "$extra_libs SED_NCDFLIBS"
+    set extra_libs = "$extra_libs SED_NCDFLIBS -lnetcdff"
     breaksw
 
   case "-hdf":

ncl-5.1.0-paths.patch:
 Project  |   14 ++++++++------
 Template |   17 +++++++++++++++++
 ymake    |    7 +++++++
 3 files changed, 32 insertions(+), 6 deletions(-)

--- NEW FILE ncl-5.1.0-paths.patch ---
diff -up ncl_ncarg-5.0.0/config/ymake.paths ncl_ncarg-5.0.0/config/ymake
--- ncl_ncarg-5.0.0/config/ymake.paths	2006-05-02 16:16:20.000000000 +0200
+++ ncl_ncarg-5.0.0/config/ymake	2008-02-01 15:19:00.000000000 +0100
@@ -185,6 +185,13 @@ if ($useinstalled != 0) then
         endif
         set defines = ($defines -D_InstBin\=$bin_dir)
 
+        set share_dir = `ncargpath share`
+        if ($status != 0) then
+                echo "$0 : Unable to find NCARG_SHARE dir" > /dev/tty
+                exit 1
+        endif
+        set defines = ($defines -D_InstShare\=$share_dir)
+
         set inc_dir = `ncargpath include`
         if ($status != 0) then
                 echo "$0 : Unable to find NCARG_INCLUDE dir" > /dev/tty
diff -up ncl_ncarg-5.0.0/config/Template.paths ncl_ncarg-5.0.0/config/Template
--- ncl_ncarg-5.0.0/config/Template.paths	2005-08-19 19:32:45.000000000 +0200
+++ ncl_ncarg-5.0.0/config/Template	2008-02-01 15:19:00.000000000 +0100
@@ -160,6 +160,14 @@ NGCOMM##################################
 #endif	/* _IgnoreYmakeRoot */
 #endif	/* BinRoot */
 
+#ifndef	ShareRoot
+#ifndef	_IgnoreYmakeRoot
+#define	ShareRoot	YmakeRoot/share
+#else
+#define	ShareRoot	_InstShare
+#endif	/* _IgnoreYmakeRoot */
+#endif	/* ShareRoot */
+
 #ifndef	LibRoot
 #ifndef	_IgnoreYmakeRoot
 #define LibRoot YmakeRoot/lib
@@ -210,6 +218,14 @@ NGCOMM##################################
 #endif
 #endif
 
+#ifndef	SharePath
+#ifdef	_UseRootPath
+#define	SharePath	RootPath/share
+#else
+#define	SharePath	ShareRoot
+#endif
+#endif
+
 #ifndef	LibPath
 #ifdef	_UseRootPath
 #define	LibPath	RootPath/lib
@@ -573,6 +589,7 @@ MANROOT			= ManRoot
 TMPROOT			= TmpRoot
 
 ROOTPATH		= RootPath
+SHAREPATH		= SharePath
 BINPATH			= BinPath
 LIBPATH			= LibPath
 INCPATH			= IncPath
diff -up ncl_ncarg-5.0.0/config/Project.paths ncl_ncarg-5.0.0/config/Project
--- ncl_ncarg-5.0.0/config/Project.paths	2007-10-11 18:38:32.000000000 +0200
+++ ncl_ncarg-5.0.0/config/Project	2008-02-01 15:19:00.000000000 +0100
@@ -227,7 +227,8 @@ ROBJDIR			= robj
 WWWDIR			= ngwww
 XAPPDIR			= xapp
 
-LIBNCARGROOT		= $(LIBROOT)/$(NCARGDIR)
+LIBNCARGROOT		= $(SHAREPATH)/$(NCARGDIR)
+LIBNCARGARCH		= $(LIBPATH)/$(NCARGDIR)
 CONFIGROOT		= $(LIBNCARGROOT)/$(CONFIGDIR)
 DBROOT			= $(LIBNCARGROOT)/$(DBDIR)
 FONTCAPROOT		= $(LIBNCARGROOT)/$(FONTCAPDIR)
@@ -235,7 +236,7 @@ GRAPHCAPROOT		= $(LIBNCARGROOT)/$(GRAPHC
 DATAROOT		= $(LIBNCARGROOT)/$(DATADIR)
 DOCROOT			= $(LIBNCARGROOT)/$(DOCDIR)
 EXAMPLESROOT		= $(LIBNCARGROOT)/$(EXAMPLESDIR)
-ROBJROOT		= $(LIBNCARGROOT)/$(ROBJDIR)
+ROBJROOT		= $(LIBNCARGARCH)/$(ROBJDIR)
 TESTSROOT		= $(LIBNCARGROOT)/$(TESTSDIR)
 TUTORIALROOT		= $(LIBNCARGROOT)/$(TUTORIALDIR)
 WWWROOT			= $(LIBNCARGROOT)/$(WWWDIR)
@@ -244,7 +245,7 @@ HLUEXROOT		= $(LIBNCARGROOT)/$(HLUEXDIR)
 RESFILEROOT		= $(LIBNCARGROOT)/$(RESDIR)
 NCLEXROOT		= $(LIBNCARGROOT)/$(NCLEXDIR)
 GRIB2CODETABLEROOT	= $(LIBNCARGROOT)/$(GRIB2CODETABLEDIR)
-LIBNCARGPATH		= $(LIBPATH)/$(NCARGDIR)
+LIBNCARGPATH		= $(SHAREPATH)/$(NCARGDIR)
 CONFIGPATH		= $(LIBNCARGPATH)/$(CONFIGDIR)
 DBPATH			= $(LIBNCARGPATH)/$(DBDIR)
 FONTCAPPATH		= $(LIBNCARGPATH)/$(FONTCAPDIR)
@@ -252,7 +253,7 @@ GRAPHCAPPATH		= $(LIBNCARGPATH)/$(GRAPHC
 DATAPATH		= $(LIBNCARGPATH)/$(DATADIR)
 DOCPATH			= $(LIBNCARGPATH)/$(DOCDIR)
 EXAMPLESPATH		= $(LIBNCARGPATH)/$(EXAMPLESDIR)
-ROBJPATH		= $(LIBNCARGPATH)/$(ROBJDIR)
+ROBJPATH		= $(LIBNCARGARCH)/$(ROBJDIR)
 TESTSPATH		= $(LIBNCARGPATH)/$(TESTSDIR)
 TUTORIALPATH		= $(LIBNCARGPATH)/$(TUTORIALDIR)
 WWWPATH			= $(LIBNCARGPATH)/$(WWWDIR)
@@ -314,10 +315,11 @@ NGENV_DESCRIPT	= \
 		"usrresfile",NULL,NULL,$(USRRESFILE),NULL,	\
 		"gks_output",NULL,NULL,"gmeta",NULL,		\
 		"bin",NULL,"root",NULL,NULL,			\
-		"lib",NULL,"root",NULL,NULL,			\
+		"lib",NULL,NULL,"$(LIBROOT)",NULL,			\
 		"include",NULL,"root",NULL,NULL,		\
+		"share",NULL,"root",NULL,NULL,			\
 		"man",NULL,"root",NULL,NULL,			\
-		"ncarg",NULL,"lib",NULL,NULL,			\
+		"ncarg",NULL,"share",NULL,NULL,			\
 		"config",NULL,"ncarg",NULL,NULL,		\
 		"data",NULL,"ncarg",NULL,NULL,			\
 		"database",NULL,"ncarg",NULL,NULL,		\

ncl-5.1.0-ppc64.patch:
 ymake |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE ncl-5.1.0-ppc64.patch ---
--- ncl_ncarg-5.1.0/config/ymake.ppc64	2009-03-05 10:54:12.000000000 -0700
+++ ncl_ncarg-5.1.0/config/ymake	2009-03-05 10:57:27.000000000 -0700
@@ -372,19 +372,13 @@
 	case    amd64:
         case    i*64:
         case    x*64:
-        case    p*64:
+        case    ppc*:
         case    alpha:
             set model   = $mach
             set arch    = $mach
             set sysincs = LINUX
             set vendor  = IBM
             breaksw
-        case    ppc:
-            set model   = $mach
-            set arch    = $mach
-            set sysincs = YDLINUX
-            set vendor  = APPLE
-            breaksw
         default:
             echo "$0 : Unknown machine type" > /dev/tty
             exit 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Feb 2008 23:32:56 -0000	1.2
+++ .cvsignore	22 Sep 2009 17:41:27 -0000	1.3
@@ -1 +1 @@
-ncl_ncarg_src-5.0.0.tar.gz
+ncl_ncarg_src-5.1.1.tar.gz


Index: Site.local.ncl
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/Site.local.ncl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Site.local.ncl	28 Feb 2008 23:32:56 -0000	1.1
+++ Site.local.ncl	22 Sep 2009 17:41:27 -0000	1.2
@@ -7,10 +7,9 @@
 #define IncSearch -I/usr/include/netcdf-3
 #define LibSearch -L at libdir@/hdf
 
-#define BuildUdunits TRUE
-#define UdUnitslib
-#define BuildV5D FALSE
-#define BuildHDFEOS FALSE
+#define BuildNetCDF4 0
+#define BuildV5D 0
+#define BuildHDFEOS 0
 #define BuildTRIANGLE 0
 #define V5Dlib
-#define BuildDODS TRUE
+#define BuildDODS 1

ncl-5.0.0-atlas.patch:
 Project |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: ncl-5.0.0-atlas.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/ncl-5.0.0-atlas.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncl-5.0.0-atlas.patch	28 Feb 2008 23:32:56 -0000	1.1
+++ ncl-5.0.0-atlas.patch	22 Sep 2009 17:41:27 -0000	1.2
@@ -6,8 +6,8 @@
  NCLAPILIB	= -lNGncl
 -BLASLIB	        = -lblas_ncl
 -LAPACKLIB       = -llapack_ncl
-+BLASLIB	        = -lblas
-+LAPACKLIB       = -llapack
++BLASLIB	        = -lcblas -lf77blas -lptf77blas
++LAPACKLIB       = -llapack -latlas
  SPHERELIB	= -lsphere3.1_dp
  FFTPACK5LIB	= -lfftpack5_dp
  
@@ -17,8 +17,8 @@
  NCLAPILIB	= _UseLib(-L$(NCLLIBSRC),-lnclapi)
 -BLASLIB         = _UseLib(-L$(BLASSRC),-lblas_ncl)
 -LAPACKLIB       = _UseLib(-L$(LAPACKSRC),-llapack_ncl)
-+BLASLIB         = _UseLib(-L%LIBDIR%/atlas,-lblas)
-+LAPACKLIB       = _UseLib(-L%LIBDIR%/atlas,-llapack)
++BLASLIB         = _UseLib(-L%LIBDIR%/atlas,-lcblas -lf77blas -lptf77blas)
++LAPACKLIB       = _UseLib(-L%LIBDIR%/atlas,-llapack -latlas)
  SPHERELIB	= _UseLib(-L$(SPHERESRC),-lsphere3.1_dp)
  FFTPACK5LIB	= _UseLib(-L$(FFTPACK5SRC),-lfftpack5_dp)
  


Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/ncl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncl.spec	28 Feb 2008 23:32:56 -0000	1.1
+++ ncl.spec	22 Sep 2009 17:41:28 -0000	1.2
@@ -1,14 +1,16 @@
 Name:           ncl
-Version:        5.0.0
-Release:        9%{?dist}
+Version:        5.1.1
+Release:        3%{?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://www.earthsystemgrid.org/ before being able to download the source.
-Source0:        http://datanode.ucar.edu/data/xserve/ncl/5.0.0/binaries/source/ncl_ncarg_src-5.0.0.tar.gz
+Source0:        ncl_ncarg_src-%{version}.tar.gz
 Source1:        Site.local.ncl
+Source2:        ncarg.csh
+Source3:        ncarg.sh
 
 # ymake uses cpp with some defines on the command line to generate a 
 # Makefile which consists in:
@@ -24,22 +26,20 @@ Source1:        Site.local.ncl
 #
 # install paths are set up in Project. Paths used in code are also in 
 # Project, in NGENV_DESCRIPT.
-Patch0:         ncl-5.0.0-paths.patch
+Patch0:         ncl-5.1.0-paths.patch
 Patch1:         ncarg-4.4.1-deps.patch
-Patch2:         ncarg-4.4.2-ppc64.patch
-Patch4:         ncl-5.0.0-triangle.patch
-Patch5:         ncl-5.0.0-flex.patch
-Patch6:         ncl-5.0.0-hdf.patch
+Patch2:         ncl-5.1.0-ppc64.patch
 Patch7:         ncl-5.0.0-atlas.patch
-Patch8:         ncl-5.0.0-png.patch
-Patch9:         ncl-5.0.0-wrapit.patch
 # don't have the installation target depends on the build target since
 # for library it implies running ranlib and modifying the library timestamp
 Patch10:        ncl-5.0.0-no_install_dep.patch
 # put install and build rules before script rules such that the default rule
 # is all
 Patch11:        ncl-5.0.0-build_n_scripts.patch
-Patch12:        ncl-5.0.0-netcdff.patch
+Patch12:        ncl-5.1.0-netcdff.patch
+Patch13:        ncl-5.1.0-includes.patch
+# Use /etc/udunits.dat
+Patch15:        ncl-5.0.0-udunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel
@@ -47,6 +47,9 @@ BuildRequires:  g2clib-devel, libnc-dap-
 # imake needed for makedepend
 BuildRequires:  imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
 BuildRequires:  byacc, flex
+BuildRequires:  udunits-devel
+Requires:       %{name}-common = %{version}-%{release}
+Requires:       udunits
 
 Provides:       ncarg = %{version}-%{release}
 Obsoletes:      ncarg < %{version}-%{release}
@@ -70,6 +73,18 @@ The software comes with a couple of usef
     files to netCDF formatted files. 
 
 
+%package common
+Summary:        Common files for NCL and NCAR Graphics
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:      noarch
+%endif
+
+%description common
+%{summary}.
+
+
 %package devel
 Summary:        Development files for NCL and NCAR Graphics
 Group:          Development/Libraries
@@ -87,6 +102,9 @@ Obsoletes:      ncarg-devel < %{version}
 Summary:        Example programs and data using NCL
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:      noarch
+%endif
 
 %description examples
 Example programs and data using NCL.
@@ -94,31 +112,23 @@ Example programs and data using NCL.
 
 %prep
 %setup -q -n ncl_ncarg-%{version}
-#%patch0 -p1 -b .rpmroot
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .deps
 %patch2 -p1 -b .ppc64
-%patch4 -p1 -b .triangle
-%patch5 -p1 -b .flex
-%patch6 -p1 -b .hdf
 %patch7 -p1 -b .atlas
-%patch8 -p1 -b .png
-%patch9 -p1 -b .wrapit
 %patch10 -p1 -b .no_install_dep
 %patch11 -p1 -b .build_n_scripts
 %patch12 -p1 -b .netcdff
-
-#Move wrapit.c to wrapit77.c to avoid flex make rule issues
-#This works in combination with the wrapit patch
-mv ni/src/mkwrap/wrapit.c ni/src/mkwrap/wrapit77.c
+%patch13 -p1 -b .includes
+%patch15 -p1 -b .udunits
 
 #Use ppc config if needed
 %ifarch ppc ppc64
 cp config/LINUX.ppc32.GNU config/LINUX
 %endif
 
-#Fixup LINUX config
-sed -i -e '/StdDefines/s/-DSYSV//' config/LINUX
+#Fixup LINUX config (to expose vsnprintf prototype)
+sed -i -e '/StdDefines/s/-DSYSV/-D_ISOC99_SOURCE/' config/LINUX
 
 #Fixup libdir for atlas lib locations
 sed -i -e s,%LIBDIR%,%{_libdir}, config/Project
@@ -132,13 +142,15 @@ sed -e 's;@prefix@;%{_prefix};' \
  -e 's;@libdir@;%{_libdir};' \
  %{SOURCE1} > config/Site.local
 
-pushd ni/src/examples
-for file in */*.ncl; do
-  sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex\([^ ;]*\);loadscript(ncargpath("nclex") + "\1);' \
+#Setup the profile scripts
+cp %{SOURCE2} %{SOURCE3} .
+sed -i -e s, at LIB@,%{_lib},g ncarg.csh ncarg.sh
+
+sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex\([^ ;]*\);loadscript(ncargpath("nclex") + "\1);' \
     -e 's;"\$NCARG_ROOT/lib/ncarg/\(data\|database\);ncargpath("\1") + ";' \
-   $file
-done
-popd
+    -e 's;\$NCARG_ROOT/lib/ncarg/nclscripts;$NCARG_ROOT/share/ncarg/nclscripts;' \
+    `find ni/src -name \*.ncl`
+
 
 %build
 # short-cicuit:
@@ -148,6 +160,8 @@ popd
 # (cd ./config; make -f Makefile.ini clean all)
 # ./config/ymake -config ./config -Curdir . -Topdir .
 
+#make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC -Werror-implicit-function-declaration" F77=gfortran F77_LD=gfortran\
+
 make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC" F77=gfortran F77_LD=gfortran\
  CTOFLIBS="-lgfortran" FCOPTIONS="$RPM_OPT_FLAGS -fPIC -fno-second-underscore -fno-range-check" \
  COPT= FOPT=
@@ -157,14 +171,19 @@ make Build CCOPTIONS="$RPM_OPT_FLAGS -fP
 rm -rf $RPM_BUILD_ROOT
 export NCARG=`pwd`
 make install DESTDIR=$RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-#install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+# database, fontcaps, and graphcaps are arch dependent
+mv $RPM_BUILD_ROOT%{_datadir}/ncarg/{database,{font,graph}caps} \
+   $RPM_BUILD_ROOT%{_libdir}/ncarg/
 # Don't conflict with allegro-devel (generic API names)
 for manpage in $RPM_BUILD_ROOT%{_mandir}/man3/*
 do
    manname=`basename $manpage`
    mv $manpage $RPM_BUILD_ROOT%{_mandir}/man3/%{name}_$manname
 done
+# Use system udunits
+rm -r $RPM_BUILD_ROOT%{_datadir}/ncarg/udunits
 # Remove $RPM_BUILD_ROOT from MakeNcl
 #sed -i -e s,$RPM_BUILD_ROOT,,g $RPM_BUILD_ROOT%{_bindir}/MakeNcl
 
@@ -176,7 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING Copyright README
-#%{_sysconfdir}/profile.d/ncarg.*sh
+%{_sysconfdir}/profile.d/ncarg.*sh
 %{_bindir}/ConvertMapData
 %{_bindir}/WriteLineFile
 %{_bindir}/WriteNameFile
@@ -223,17 +242,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/tdpackdemo
 %{_bindir}/tgks0a
 %{_bindir}/tlocal
+%{_libdir}/ncarg/database/
+%{_libdir}/ncarg/fontcaps/
+%{_libdir}/ncarg/graphcaps/
+
+%files common
+%defattr(-,root,root,-)
 %dir %{_datadir}/ncarg
 %{_datadir}/ncarg/colormaps/
 %{_datadir}/ncarg/data/
-%{_datadir}/ncarg/database/
-%{_datadir}/ncarg/fontcaps/
-%{_datadir}/ncarg/graphcaps/
 %{_datadir}/ncarg/grib2_codetables/
 %{_datadir}/ncarg/nclscripts/
 %{_datadir}/ncarg/ngwww/
 %{_datadir}/ncarg/sysresfile/
-%{_datadir}/ncarg/udunits/
 %{_datadir}/ncarg/xapp/
 %{_mandir}/man1/*.gz
 %{_mandir}/man5/*.gz
@@ -261,12 +282,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ncarg/libncarg_ras.a
 %{_libdir}/ncarg/libncl.a
 %{_libdir}/ncarg/libnclapi.a
-%{_libdir}/ncarg/libnio.a
 %{_libdir}/ncarg/libngmath.a
 %{_libdir}/ncarg/libnfp.a
 %{_libdir}/ncarg/libnfpfort.a
+%{_libdir}/ncarg/libnio.a
 %{_libdir}/ncarg/libsphere3.1_dp.a
-%{_libdir}/ncarg/ncarg/robj/
+%{_libdir}/ncarg/ncarg/
 %{_mandir}/man3/*.gz
 
 %files examples
@@ -282,6 +303,66 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 23 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.1-2
+- Rebuild for libdap 3.9.3
+
+* Mon Jul 13 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.1-1
+- Update to 5.1.1
+
+* Tue Jul 7 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-4
+- Fixup more paths in shipped ncl scripts (bug #505240)
+
+* Tue May 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-3
+- Move database back to main arch dependent package
+ 
+* Tue May 19 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-2
+- Set NCARG_NCARG to /usr/share/ncarg
+- Move fontcaps and graphcaps back to main arch dependent package
+
+* Thu Mar 5 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-1
+- Update to 5.1.0
+- Rebase ppc64, netcdff patch
+- Drop triangle, flex, hdf, png, wrapit, uint32 patch upstreamed
+
+* Tue Feb 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-19
+- Rebuild for gcc 4.4.0 and other changes
+- Move data files into noarch sub-package
+- Make examples sub-package noarch
+
+* Mon Feb 2 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-18
+- Fix unowned directory (bug #483468)
+
+* Mon Dec 15 2008 Deji Akingunola <dakingun at gmail.com> - 5.0.0-17
+- Rebuild for atlas-3.8.2
+
+* Fri Dec 12 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-16
+- Re-add profile.d startup scripts to set NCARG env variables
+
+* Mon Dec 8 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-15
+- Try changing the udunits path in config/Project
+
+* Thu Dec 4 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-14
+- Actually apply udunits patch
+
+* Thu Nov 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-13
+- Enable udunits support add use system udunits.dat
+
+* Thu Sep 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-12
+- Rebuild for new libdap
+- Fix netcdf include location
+
+* Fri Apr 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-11
+- Add patch to fix raster image problems on non 32-bit platforms
+- Add more includes to includes patch
+
+* Thu Mar 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-10
+- Add patch to fixup some missing includes
+- Define _ISOC99_SOURCE to expose vsnprintf prototype
+- Update hdf patch to remove hdf/netcdf.h include
+
 * Mon Feb 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-9
 - Rename Site.local to Site.local.ncl
 - Add comment for imake BR


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Feb 2008 23:32:56 -0000	1.2
+++ sources	22 Sep 2009 17:41:28 -0000	1.3
@@ -1 +1 @@
-3a1bfbab90ebce230c1f494949534f8a  ncl_ncarg_src-5.0.0.tar.gz
+42154992f2966320dc9f8958b9d81da3  ncl_ncarg_src-5.1.1.tar.gz


--- ncarg-4.4.2-ppc64.patch DELETED ---


--- ncl-5.0.0-flex.patch DELETED ---


--- ncl-5.0.0-hdf.patch DELETED ---


--- ncl-5.0.0-netcdff.patch DELETED ---


--- ncl-5.0.0-paths.patch DELETED ---


--- ncl-5.0.0-png.patch DELETED ---


--- ncl-5.0.0-triangle.patch DELETED ---


--- ncl-5.0.0-wrapit.patch DELETED ---




More information about the fedora-extras-commits mailing list