diff --git a/1322.patch b/1322.patch index 269e281..530d994 100644 --- a/1322.patch +++ b/1322.patch @@ -4,12 +4,10 @@ Date: Wed, 8 May 2024 20:50:22 -0600 Subject: [PATCH] Fix incompatbile pointer argument to nc_put_att_string() --- - include/netCDF4.pxi | 2 +- - src/netCDF4/_netCDF4.pyx | 4 ++-- + include/netCDF4.pxi | 2 +- + src/netCDF4/_netCDF4.pyx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/include/netCDF4.pxi b/include/netCDF4.pxi -index 00d883662..9404171db 100644 --- a/include/netCDF4.pxi +++ b/include/netCDF4.pxi @@ -263,7 +263,7 @@ cdef extern from "netcdf.h": @@ -21,11 +19,9 @@ index 00d883662..9404171db 100644 int nc_def_opaque(int ncid, size_t size, char *name, nc_type *xtypep) nogil int nc_inq_opaque(int ncid, nc_type xtype, char *name, size_t *sizep) nogil int nc_put_att_opaque(int ncid, int varid, char *name, -diff --git a/src/netCDF4/_netCDF4.pyx b/src/netCDF4/_netCDF4.pyx -index 640ab6846..b957f4e35 100644 --- a/src/netCDF4/_netCDF4.pyx +++ b/src/netCDF4/_netCDF4.pyx -@@ -1796,7 +1796,7 @@ be raised in the next release.""" +@@ -1720,7 +1720,7 @@ be raised in the next release.""" string_ptrs[j] = strings[j] issue485_workaround(grpid, varid, attname) with nogil: @@ -34,7 +30,7 @@ index 640ab6846..b957f4e35 100644 finally: PyMem_Free(string_ptrs) else: -@@ -1825,7 +1825,7 @@ be raised in the next release.""" +@@ -1749,7 +1749,7 @@ be raised in the next release.""" except UnicodeError: issue485_workaround(grpid, varid, attname) with nogil: diff --git a/python-netCDF4.changes b/python-netCDF4.changes index a2f066e..368fc16 100644 --- a/python-netCDF4.changes +++ b/python-netCDF4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 29 21:17:41 UTC 2024 - Matej Cepl + +- Clean up the SPEC file. + ------------------------------------------------------------------- Wed May 29 14:15:42 UTC 2024 - John Paul Adrian Glaubitz diff --git a/python-netCDF4.spec b/python-netCDF4.spec index 485d784..61cd211 100644 --- a/python-netCDF4.spec +++ b/python-netCDF4.spec @@ -25,7 +25,7 @@ URL: https://github.com/Unidata/netcdf4-python Source: https://files.pythonhosted.org/packages/source/n/netCDF4/netCDF4-%{version}.tar.gz Source99: python-netCDF4.rpmlintrc # PATCH-FIX-UPSTREAM Fix incompatbile pointer argument to nc_put_att_string() -Patch: https://github.com/Unidata/netcdf4-python/pull/1322.patch +Patch0: https://github.com/Unidata/netcdf4-python/pull/1322.patch BuildRequires: %{python_module Cython >= 0.29 with %python-Cython < 3} BuildRequires: %{python_module certifi} BuildRequires: %{python_module cftime} @@ -69,8 +69,7 @@ types are not. Mixtures of compound and vlen data types (compound types containing vlens, and vlens containing compound types) are not supported. %prep -%setup -q -n netCDF4-%{version} -%patch -P0 -p1 +%autosetup -p1 -n netCDF4-%{version} %build export CFLAGS="%{optflags} -fno-strict-aliasing"