From 551e475d1ce3e3753b9a8ec21972cb2d1b80a190 Mon Sep 17 00:00:00 2001
From: Ed Hill <edhill@fedoraproject.org>
Date: Apr 22 2006 03:07:19 +0000
Subject: update to new upstream 3.1.2


---

diff --git a/.cvsignore b/.cvsignore
index d2ba5b7..b38ffce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nco-3.0.2.tar.gz
+nco-3.1.2.tar.gz
diff --git a/nco.spec b/nco.spec
index 08e20de..6464db3 100644
--- a/nco.spec
+++ b/nco.spec
@@ -1,6 +1,6 @@
 Name:           nco
-Version:        3.0.2
-Release:        2%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPL
@@ -12,9 +12,9 @@ URL:            http://nco.sourceforge.net/
 #    cvs -z3 -d:pserver:anonymous@cvs.sf.net:/cvsroot/nco co \
 #        -r nco-3_0_2 -d nco-3.0.2 nco
 #    tar -czf nco-3.0.2.tar.gz ./nco-3.0.2
-Source0:        nco-3.0.2.tar.gz
+Source0:        nco-3.1.2.tar.gz
 Patch0:		nco_install_C_headers.patch
-Patch1:         nco-3.0.0-fixudunits.patch
+#Patch1:         nco-3.0.0-fixudunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  netcdf-devel, libtool, automake, autoconf
@@ -51,19 +51,20 @@ This package contains the NCO header files and static libs.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 aclocal
 autoheader
 automake --foreign
 autoconf
-export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
+export CPPFLAGS=-I%{_includedir}/netcdf-3
+export LDFLAGS=-L%{_libdir}/netcdf-3
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
 %configure --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
-unset NETCDF_INC NETCDF_LIB CPPFLAGS
+unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -72,6 +73,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/nco
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mpnc*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -106,6 +108,9 @@ fi
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed@eh3.com> - 3.1.2-1
+- update to new upstream 3.1.2
+
 * Thu Feb 16 2006 Ed Hill <ed@eh3.com> - 3.0.2-2
 - rebuild for new gcc
 
diff --git a/nco_install_C_headers.patch b/nco_install_C_headers.patch
index 2aefb14..b93bf6a 100644
--- a/nco_install_C_headers.patch
+++ b/nco_install_C_headers.patch
@@ -1,11 +1,11 @@
---- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
-+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
-@@ -69,6 +69,8 @@
+--- nco-3.1.2/src/nco/Makefile.am.ORIG	2006-04-21 21:45:56.000000000 -0400
++++ nco-3.1.2/src/nco/Makefile.am	2006-04-21 21:46:52.000000000 -0400
+@@ -127,6 +127,8 @@
  # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
  libnco_la_LDFLAGS = -release @VERSION@
  
 +include_HEADERS = $(HEADER_SRC)
 +
- libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
- nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
- nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \
+ libnco_la_SOURCES = \
+ $(HEADER_SRC) \
+ ${NCO_GETOPT} \
diff --git a/sources b/sources
index 30a8d9c..b1793a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46ddd902c9fd86e5d655ddcc8ce647c7  nco-3.0.2.tar.gz
+57164e52ae4cf67fa21edb062c746f52  nco-3.1.2.tar.gz