From 308bf36a7891ebb94533a2100bdc60c0af4f920f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jun 03 2016 15:07:35 +0000 Subject: Update to 4.6.0 - Add patch to fix library version variable --- diff --git a/.gitignore b/.gitignore index 778dad0..647cd47 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ nco-4.0.2.tar.gz /nco-4.5.3.tar.gz /nco-4.5.4.tar.gz /nco-4.5.5.tar.gz +/nco-4.6.0.tar.gz diff --git a/nco-version.patch b/nco-version.patch new file mode 100644 index 0000000..507409c --- /dev/null +++ b/nco-version.patch @@ -0,0 +1,12 @@ +diff -up nco-4.6.0/src/nco_c++/Makefile.in.version nco-4.6.0/src/nco_c++/Makefile.in +--- nco-4.6.0/src/nco_c++/Makefile.in.version 2016-05-12 12:42:00.000000000 -0600 ++++ nco-4.6.0/src/nco_c++/Makefile.in 2016-06-03 09:03:47.395310941 -0600 +@@ -549,7 +549,7 @@ lib_LTLIBRARIES = libnco_c++.la + include_HEADERS = libnco_c++.hh nco_dmn.hh nco_hgh.hh nco_var.hh nco_att.hh nco_fl.hh nco_utl.hh + libnco_c___la_SOURCES = nco_att.cc nco_dmn.cc nco_fl.cc nco_hgh.cc nco_utl.cc nco_var.cc + libnco_c___la_CPPFLAGS = -DABORT_ON_ERROR +-libnco_c___la_LDFLAGS = -release @NCO_VERSION@ ++libnco_c___la_LDFLAGS = -release @VERSION@ + tst_SOURCES = tst.cc + tst_LDADD = -lnco_c++ + TESTPROGRAMS = tst diff --git a/nco.spec b/nco.spec index 13e702e..ccc5275 100644 --- a/nco.spec +++ b/nco.spec @@ -1,8 +1,8 @@ %global builddocs 1 Name: nco -Version: 4.5.5 -Release: 2%{?dist} +Version: 4.6.0 +Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPLv3 @@ -14,6 +14,8 @@ Patch0: nco-4.0.3-install_C_headers.patch #Patch out variables from in.cdl that earlier versioins of netcdf complain about Patch1: nco-4.0.5-fillvalue.patch %endif +# Fix library version variable +Patch2: nco-version.patch BuildRequires: bison, flex, gawk BuildRequires: netcdf-devel @@ -70,6 +72,7 @@ This package contains the NCO static libs. %if 0%{?rhel} && 0%{?rhel} <= 5 %patch1 -p1 -b .fillvalue %endif +%patch2 -p1 -b .version %build @@ -127,6 +130,7 @@ fi %{_bindir}/ncap2 %{_bindir}/ncatted %{_bindir}/ncbo +%{_bindir}/ncclimo %{_bindir}/ncdiff %{_bindir}/ncea %{_bindir}/ncecat @@ -143,6 +147,7 @@ fi %{_mandir}/man1/ncap2.1* %{_mandir}/man1/ncatted.1* %{_mandir}/man1/ncbo.1* +%{_mandir}/man1/ncclimo.1* %{_mandir}/man1/ncecat.1* %{_mandir}/man1/nces.1* %{_mandir}/man1/ncflint.1* @@ -167,6 +172,10 @@ fi %changelog +* Fri Jun 3 2016 Orion Poplawski 4.6.0-1 +- Update to 4.6.0 +- Add patch to fix library version variable + * Mon Feb 22 2016 Orion Poplawski - 4.5.5-2 - Rebuild for gsl 2.1 diff --git a/sources b/sources index 391f217..cf407b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f1f1cb149ad6407c5a03c20122223ce nco-4.5.5.tar.gz +104fc5b495333c060375eed13a15a414 nco-4.6.0.tar.gz