rpms/ncl/F-9 ncl-5.0.0-udunits.patch, NONE, 1.1 Site.local.ncl, 1.1, 1.2 ncl.spec, 1.3, 1.4

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/ncl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16260

Modified Files:
	Site.local.ncl ncl.spec 
Added Files:
	ncl-5.0.0-udunits.patch 
Log Message:
* Thu Nov 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-12
- Enable udunits support add use system udunits.dat (bug #473190)


ncl-5.0.0-udunits.patch:

--- NEW FILE ncl-5.0.0-udunits.patch ---
--- ncl_ncarg-5.0.0/ni/src/lib/nfp/udunitsW.c.udunits	2006-12-10 19:07:06.000000000 -0700
+++ ncl_ncarg-5.0.0/ni/src/lib/nfp/udunitsW.c	2008-11-27 08:41:11.000000000 -0700
@@ -23,21 +23,7 @@
  */
   path = getenv("UDUNITS_PATH");
   if ((void *)path == (void *)NULL) {
-    path = _NGGetNCARGEnv("udunits");
-    if ((void *)path != (void *)NULL) {
-      strcpy(udunits_file,path);
-      strcat(udunits_file,_NhlPATHDELIMITER);
-      strcat(udunits_file,"udunits.dat");
-      utret = utInit(udunits_file);
-    }
-    else {
-/*
- * Use path built-in at compile time. It's not a good thing if we reach
- * this point, because the "_NGGetNCARGEnv" call above should have
- * returned a valid path.
- */
-      utret = utInit("");
-    }
+    path = "/etc/udunits.dat";
   }
   else {
 /*


Index: Site.local.ncl
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-9/Site.local.ncl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Site.local.ncl	28 Feb 2008 22:11:41 -0000	1.1
+++ Site.local.ncl	28 Nov 2008 03:14:39 -0000	1.2
@@ -7,8 +7,6 @@
 #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 BuildTRIANGLE 0


Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-9/ncl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ncl.spec	11 Apr 2008 16:40:51 -0000	1.3
+++ ncl.spec	28 Nov 2008 03:14:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ncl
 Version:        5.0.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
@@ -42,6 +42,8 @@
 Patch12:        ncl-5.0.0-netcdff.patch
 Patch13:        ncl-5.0.0-includes.patch
 Patch14:        ncl-5.0.0-uint32.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
@@ -49,6 +51,8 @@
 # imake needed for makedepend
 BuildRequires:  imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
 BuildRequires:  byacc, flex
+BuildRequires:  udunits-devel
+Requires:       udunits
 
 Provides:       ncarg = %{version}-%{release}
 Obsoletes:      ncarg < %{version}-%{release}
@@ -171,6 +175,8 @@
    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
 
@@ -239,7 +245,6 @@
 %{_datadir}/ncarg/nclscripts/
 %{_datadir}/ncarg/ngwww/
 %{_datadir}/ncarg/sysresfile/
-%{_datadir}/ncarg/udunits/
 %{_datadir}/ncarg/xapp/
 %{_mandir}/man1/*.gz
 %{_mandir}/man5/*.gz
@@ -288,6 +293,9 @@
 
 
 %changelog
+* Thu Nov 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-12
+- Enable udunits support add use system udunits.dat (bug #473190)
+
 * 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