Update to 4.4.1.1
This commit is contained in:
Orion Poplawski
parent
57398e6eed
commit
5a4851a658
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ netcdf-4.1.1.tar.gz
|
||||
/netcdf-4.3.3.1.tar.gz
|
||||
/netcdf-4.4.0.tar.gz
|
||||
/netcdf-4.4.1.tar.gz
|
||||
/netcdf-4.4.1.1.tar.gz
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
diff -up netcdf-c-4.4.1/libsrc/dim.c.hashmap netcdf-c-4.4.1/libsrc/dim.c
|
||||
--- netcdf-c-4.4.1/libsrc/dim.c.hashmap 2016-07-07 07:56:11.162288945 -0600
|
||||
+++ netcdf-c-4.4.1/libsrc/dim.c 2016-07-07 08:00:16.655658910 -0600
|
||||
@@ -475,10 +475,12 @@ NC3_rename_dim( int ncid, int dimid, con
|
||||
free(newname);
|
||||
if(newStr == NULL)
|
||||
return NC_ENOMEM;
|
||||
- dimp->name = newStr;
|
||||
|
||||
/* Remove old name from hashmap; add new... */
|
||||
NC_hashmapRemoveDim(&ncp->dims, old->cp);
|
||||
+
|
||||
+ dimp->name = newStr;
|
||||
+
|
||||
NC_hashmapAddDim(&ncp->dims, dimid, newStr->cp);
|
||||
free_NC_string(old);
|
||||
|
||||
@@ -487,13 +489,14 @@ NC3_rename_dim( int ncid, int dimid, con
|
||||
|
||||
/* else, not in define mode */
|
||||
|
||||
+ /* Remove old name from hashmap; add new... */
|
||||
+ NC_hashmapRemoveDim(&ncp->dims, old->cp);
|
||||
+
|
||||
status = set_NC_string(dimp->name, newname);
|
||||
free(newname);
|
||||
if(status != NC_NOERR)
|
||||
return status;
|
||||
|
||||
- /* Remove old name from hashmap; add new... */
|
||||
- NC_hashmapRemoveDim(&ncp->dims, old->cp);
|
||||
NC_hashmapAddDim(&ncp->dims, dimid, dimp->name->cp);
|
||||
|
||||
set_NC_hdirty(ncp);
|
||||
diff -up netcdf-c-4.4.1/libsrc/var.c.hashmap netcdf-c-4.4.1/libsrc/var.c
|
||||
--- netcdf-c-4.4.1/libsrc/var.c.hashmap 2016-07-07 07:56:11.162288945 -0600
|
||||
+++ netcdf-c-4.4.1/libsrc/var.c 2016-07-07 07:58:52.282847833 -0600
|
||||
@@ -740,14 +740,15 @@ NC3_rename_var(int ncid, int varid, cons
|
||||
return NC_ENOMEM;
|
||||
if(NC_indef(ncp))
|
||||
{
|
||||
+ /* Remove old name from hashmap; add new... */
|
||||
+ NC_hashmapRemoveVar(&ncp->vars, old->cp);
|
||||
+
|
||||
newStr = new_NC_string(strlen(newname),newname);
|
||||
free(newname);
|
||||
if(newStr == NULL)
|
||||
return(-1);
|
||||
varp->name = newStr;
|
||||
|
||||
- /* Remove old name from hashmap; add new... */
|
||||
- NC_hashmapRemoveVar(&ncp->vars, old->cp);
|
||||
NC_hashmapAddVar(&ncp->vars, varid, newStr->cp);
|
||||
free_NC_string(old);
|
||||
|
||||
@@ -755,13 +756,14 @@ NC3_rename_var(int ncid, int varid, cons
|
||||
}
|
||||
|
||||
/* else, not in define mode */
|
||||
+ /* Remove old name from hashmap; add new... */
|
||||
+ NC_hashmapRemoveVar(&ncp->vars, old->cp);
|
||||
+
|
||||
status = set_NC_string(varp->name, newname);
|
||||
free(newname);
|
||||
if(status != NC_NOERR)
|
||||
return status;
|
||||
|
||||
- /* Remove old name from hashmap; add new... */
|
||||
- NC_hashmapRemoveVar(&ncp->vars, old->cp);
|
||||
NC_hashmapAddVar(&ncp->vars, varid, varp->name->cp);
|
||||
|
||||
set_NC_hdirty(ncp);
|
||||
@ -1,25 +0,0 @@
|
||||
diff -up netcdf-4.2.1-rc1/nc-config.in.pkgconfig netcdf-4.2.1-rc1/nc-config.in
|
||||
--- netcdf-4.2.1-rc1/nc-config.in.pkgconfig 2012-06-18 12:33:10.000000000 -0600
|
||||
+++ netcdf-4.2.1-rc1/nc-config.in 2012-06-20 16:44:29.292019812 -0600
|
||||
@@ -6,12 +6,10 @@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
cc="@CC@"
|
||||
cflags=" -I${includedir} @CPPFLAGS@"
|
||||
-libs="-L${libdir} @NC_LIBS@"
|
||||
has_dap="@HAS_DAP@"
|
||||
has_nc2="@HAS_NC2@"
|
||||
has_nc4="@HAS_NC4@"
|
||||
@@ -189,7 +187,7 @@ while test $# -gt 0; do
|
||||
;;
|
||||
|
||||
--libs)
|
||||
- echo $libs
|
||||
+ pkg-config netcdf --libs
|
||||
;;
|
||||
|
||||
--prefix)
|
||||
11
netcdf.spec
11
netcdf.spec
@ -1,15 +1,12 @@
|
||||
Name: netcdf
|
||||
Version: 4.4.1
|
||||
Release: 4%{?dist}
|
||||
Version: 4.4.1.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Libraries for the Unidata network Common Data Form
|
||||
|
||||
Group: Applications/Engineering
|
||||
License: NetCDF
|
||||
URL: http://www.unidata.ucar.edu/software/netcdf/
|
||||
Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# Upstream patch to fix hashmap issue
|
||||
# https://github.com/Unidata/netcdf-c/issues/282
|
||||
Patch0: netcdf-hashmap.patch
|
||||
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: doxygen
|
||||
@ -178,7 +175,6 @@ NetCDF parallel openmpi static libraries
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-c-%{version}
|
||||
%patch0 -p1 -b .hashmap
|
||||
m4 libsrc/ncx.m4 > libsrc/ncx.c
|
||||
|
||||
|
||||
@ -334,6 +330,9 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Nov 29 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-1
|
||||
- Update to 4.4.1.1
|
||||
|
||||
* Fri Oct 21 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1-4
|
||||
- Rebuild for openmpi 2.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user