rpms/ncl/devel ncl-5.0.0-udunits.patch,1.1,1.2 ncl.spec,1.7,1.8
Orion Poplawski
orion at fedoraproject.org
Mon Dec 8 23:31:54 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32379/devel
Modified Files:
ncl-5.0.0-udunits.patch ncl.spec
Log Message:
* Mon Dec 8 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-15
- Try changing the udunits path in config/Project
ncl-5.0.0-udunits.patch:
Index: ncl-5.0.0-udunits.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl-5.0.0-udunits.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncl-5.0.0-udunits.patch 28 Nov 2008 03:21:27 -0000 1.1
+++ ncl-5.0.0-udunits.patch 8 Dec 2008 23:31:53 -0000 1.2
@@ -1,25 +1,11 @@
---- 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 {
- /*
+--- 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, \
Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ncl.spec 4 Dec 2008 22:41:02 -0000 1.7
+++ ncl.spec 8 Dec 2008 23:31:53 -0000 1.8
@@ -1,6 +1,6 @@
Name: ncl
Version: 5.0.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: NCAR Command Language and NCAR Graphics
Group: Applications/Engineering
@@ -295,6 +295,9 @@
%changelog
+* 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
More information about the fedora-extras-commits
mailing list