diff --git a/.gitignore b/.gitignore index fb405ae..f2caf3b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /wgrib2.tgz.v1.9.1 /wgrib2-1.9.1.c.tar.gz /wgrib2.tgz.v1.9.1.c +/wgrib2-1.9.3.tar.gz +/wgrib2.tgz.v1.9.3 diff --git a/config.h b/config.h index 1c988ec..f8533dd 100644 --- a/config.h +++ b/config.h @@ -1,6 +1,5 @@ /* config.h */ #define USE_REGEX #define USE_TIGGE -#define USE_NETCDF3 #define USE_NETCDF4 #define USE_MYSQL diff --git a/sources b/sources index 3413512..c62a9f2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e51c9fe003d65d51a1df29e8f35dc09d wgrib2-1.9.1.c.tar.gz -d653208a7b58e572a2641d29943ef0d9 wgrib2.tgz.v1.9.1.c +4bd081f4326543b52dcf12f8abb3f823 wgrib2-1.9.3.tar.gz +08f584aceaff2c5ccc24ad6faa152950 wgrib2.tgz.v1.9.3 diff --git a/wgrib2-1.9.3-ifdef.patch b/wgrib2-1.9.3-ifdef.patch new file mode 100644 index 0000000..b213ddc --- /dev/null +++ b/wgrib2-1.9.3-ifdef.patch @@ -0,0 +1,11 @@ +--- grib2/wgrib2/Netcdf.c.ifdef 2011-05-17 11:54:05.000000000 -0600 ++++ grib2/wgrib2/Netcdf.c 2011-05-26 10:26:23.670517035 -0600 +@@ -28,7 +28,7 @@ + #include + + // change by Sander Hulst 5/2011, for netcdf-4 library compiled without netcdf-4/hdf format +-#if define USE_NETCDF3 ++#if defined USE_NETCDF3 + #undef NC_NETCDF4 + #endif + diff --git a/wgrib2.spec b/wgrib2.spec index e5ba68d..3c7045c 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,5 +1,5 @@ Name: wgrib2 -Version: 1.9.1.c +Version: 1.9.3 Release: 1%{?dist} Summary: Manipulate, inventory and decode GRIB2 files @@ -15,6 +15,7 @@ URL: http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/ #Source0: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v%{version} Source0: wgrib2-%{version}.tar.gz Source1: config.h +Patch0: wgrib2-1.9.3-ifdef.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: g2clib-static, zlib-devel, netcdf-devel @@ -27,6 +28,7 @@ extract data. You can do basic database operations and other nifty things. %prep %setup -q -n grib2 +%patch0 -p1 -b .ifdef rm -rf g2clib-* *.tar.gz cp %SOURCE1 wgrib2/config.h @@ -35,7 +37,7 @@ cp %SOURCE1 wgrib2/config.h cd wgrib2 export CFLAGS="-I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS" export LDFLAGS="-lgrib2c -ljasper -lnetcdf -lpng -L%{_libdir}/mysql -lmysqlclient -lz -lm" -make %{?_smp_mflags} +make %install @@ -55,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 26 2011 Orion Poplawski - 1.9.3-1 +- Update to 1.9.3 +- Add patch to fix ifdef typo +- Drop parallel make, not safe + * Thu Mar 31 2011 Orion Poplawski - 1.9.1.c-1 - Update to 1.9.1.c