diff --git a/.gitignore b/.gitignore index e73ed07..8147c11 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ nco-4.0.2.tar.gz /nco-4.5.5.tar.gz /nco-4.6.0.tar.gz /nco-4.6.1.tar.gz +/nco-4.6.2.tar.gz diff --git a/nco-4.0.3-install_C_headers.patch b/nco-4.0.3-install_C_headers.patch deleted file mode 100644 index 4d78a0e..0000000 --- a/nco-4.0.3-install_C_headers.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nco-4.0.3/src/nco/Makefile.in.install_C_headers 2010-07-29 12:49:50.000000000 -0600 -+++ nco-4.0.3/src/nco/Makefile.in 2010-09-07 11:00:22.250159052 -0600 -@@ -452,7 +452,7 @@ - # To my knowledge, though, only NCO programs use libnco - # For this reason Debian packages should not (yet) install NCO headers - # Remove following line until learn how to prevent Debian from installing headers --#include_HEADERS = $(HEADER_SRC) -+include_HEADERS = $(HEADER_SRC) - libnco_la_SOURCES = \ - ${HEADER_SRC} \ - ${NCO_GETOPT_C} \ diff --git a/nco-install_C_headers.patch b/nco-install_C_headers.patch new file mode 100644 index 0000000..00e807c --- /dev/null +++ b/nco-install_C_headers.patch @@ -0,0 +1,12 @@ +diff -up nco-4.6.2/src/nco/Makefile.in.install_C_headers nco-4.6.2/src/nco/Makefile.in +--- nco-4.6.2/src/nco/Makefile.in.install_C_headers 2016-11-16 10:01:08.000000000 -0700 ++++ nco-4.6.2/src/nco/Makefile.in 2016-11-16 21:40:00.542048653 -0700 +@@ -767,7 +767,7 @@ libnco_la_LDFLAGS = -release @VERSION@ + # To my knowledge, though, only NCO programs use libnco + # For this reason Debian packages should not (yet) install NCO headers + # Remove following line until learn how to prevent Debian from installing headers +-#include_HEADERS = $(HEADER_SRC) ++include_HEADERS = $(HEADER_SRC) + libnco_la_SOURCES = \ + ${HEADER_SRC} \ + ${NCO_GETOPT_C} \ diff --git a/nco.spec b/nco.spec index 4f67642..75d1ab0 100644 --- a/nco.spec +++ b/nco.spec @@ -1,7 +1,7 @@ %global builddocs 1 Name: nco -Version: 4.6.1 +Version: 4.6.2 Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering @@ -9,7 +9,7 @@ License: GPLv3 URL: http://nco.sourceforge.net/ Source0: https://github.com/nco/nco/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: nco-4.0.3-install_C_headers.patch +Patch0: nco-install_C_headers.patch %if 0%{?rhel} && 0%{?rhel} <= 5 #Patch out variables from in.cdl that earlier versioins of netcdf complain about Patch1: nco-4.0.5-fillvalue.patch @@ -169,6 +169,9 @@ fi %changelog +* Wed Nov 16 2016 Orion Poplawski 4.6.2-1 +- Update to 4.6.2 + * Wed Aug 10 2016 Orion Poplawski 4.6.1-1 - Update to 4.6.1 - Drop version patch fixed upstream diff --git a/sources b/sources index 0f7c692..fa4b3ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef43cc989229c2790a9094bd84728fd8 nco-4.6.1.tar.gz +b7471acf0cc100343392f4171fb56113 nco-4.6.2.tar.gz