diff --git a/netcdf-utf8.patch b/netcdf-utf8.patch new file mode 100644 index 0000000..08617fb --- /dev/null +++ b/netcdf-utf8.patch @@ -0,0 +1,13 @@ +diff --git a/include/netcdf.h b/include/netcdf.h +index 3e0b349..58e7fb1 100644 +--- a/include/netcdf.h ++++ b/include/netcdf.h +@@ -171,7 +171,7 @@ Use this in mode flags for both nc_create() and nc_open(). */ + + /** Extended format specifier returned by nc_inq_format_extended() + * Added in version 4.3.1. This returns the true format of the +- * underlying data‥ ++ * underlying data + * The function returns two values + * 1. a small integer indicating the underlying source type + * of the data. Note that this may differ from what the user diff --git a/netcdf.spec b/netcdf.spec index 52a18bf..2e486d5 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,6 +1,6 @@ Name: netcdf Version: 4.3.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Libraries for the Unidata network Common Data Form Group: Applications/Engineering @@ -12,6 +12,9 @@ Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz #Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/snapshot/netcdf-4-daily.tar.gz #Use pkgconfig in nc-config to avoid multi-lib issues Patch0: netcdf-pkgconfig.patch +# Strip utf-8 character from netcdf.h for now +# https://github.com/Unidata/netcdf-c/issues/29 +Patch1: netcdf-utf8.patch BuildRequires: chrpath BuildRequires: doxygen @@ -182,6 +185,7 @@ NetCDF parallel openmpi static libraries %prep %setup -q -n %{name}-c-%{version} %patch0 -p1 -b .pkgconfig +%patch1 -p1 -b .utf8 %build @@ -329,6 +333,10 @@ make -C build check %changelog +* Fri Mar 7 2014 Orion Poplawski - 4.3.1.1-3 +- Strip UTF-8 character from netcdf.h for now, causes problems with + netcdf4-python build + * Sat Feb 22 2014 Deji Akingunola - 4.3.1.1-2 - Rebuild for mpich-3.1