rpms/nco/devel nco_find_udunits-dat.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nco.spec, 1.5, 1.6 sources, 1.4, 1.5

[Ed Hill (edhill)]

Author: edhill

Update of /cvs/extras/rpms/nco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331

Modified Files:
	.cvsignore nco.spec sources 
Added Files:
	nco_find_udunits-dat.patch 
Log Message:
new upstream 3.1.5


nco_find_udunits-dat.patch:

--- NEW FILE nco_find_udunits-dat.patch ---
--- nco-3.1.5/configure.in.ORIG	2006-09-02 16:47:04.000000000 -0400
+++ nco-3.1.5/configure.in	2006-09-02 16:49:23.000000000 -0400
@@ -681,7 +681,11 @@
   elif test "${NETCDF_INC}"; then
     nco_udunits_dat="${NETCDF_INC}/../etc/udunits.dat"
   else
-    nco_udunits_dat="/usr/local/etc/udunits.dat"
+    for udunits_fdat_file in /usr/local/etc/udunits.dat /etc/udunits.dat ; do
+      if test -e "$udunits_fdat_file" ; then
+        nco_udunits_dat="$udunits_fdat_file"
+      fi
+    done
   fi
 # warn if udunits.dat is not found, but continue anyway since the builder may savy and know to add it later, like when building packages (e.g. .debs)
   AC_CHECK_FILE([$nco_udunits_dat],,AC_WARN([file $nco_udunits_dat was not found but will be compiled into NCO. Some executables may fail without it.]))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Apr 2006 03:07:19 -0000	1.4
+++ .cvsignore	2 Sep 2006 21:04:06 -0000	1.5
@@ -1 +1 @@
-nco-3.1.2.tar.gz
+nco-3.1.5.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nco.spec	22 Apr 2006 03:07:19 -0000	1.5
+++ nco.spec	2 Sep 2006 21:04:06 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           nco
-Version:        3.1.2
+Version:        3.1.5
 Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
@@ -8,15 +8,16 @@
 
 #  The NCO web site now recommends CVS so the tar.gz was obtained
 #  using the following recommended commands:
-#    cvs -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco login
-#    cvs -z3 -d:pserver:anonymous at 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.1.2.tar.gz
+#    cvs -d:pserver:anonymous at nco.cvs.sourceforge.net:/cvsroot/nco login
+#    cvs -z3 -d:pserver:anonymous at nco.cvs.sourceforge.net:/cvsroot/nco \
+#        co -r nco-3_1_5 -d nco-%{version} nco
+#    tar -czf nco-%{version}.tar.gz ./nco-%{version}
+Source0:        nco-%{version}.tar.gz
 Patch0:		nco_install_C_headers.patch
-#Patch1:         nco-3.0.0-fixudunits.patch
+Patch1:         nco_find_udunits-dat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  bison
 BuildRequires:  netcdf-devel, libtool, automake, autoconf
 #  BuildRequires:  udunits, udunits-devel, opendap-devel
 BuildRequires:  udunits, udunits-devel
@@ -51,7 +52,7 @@
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 
 %build
 aclocal
@@ -108,6 +109,9 @@
 
 
 %changelog
+* Sat Sep  2 2006 Ed Hill <ed at eh3.com> - 3.1.5-1
+- new upstream 3.1.5
+
 * Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.1.2-1
 - update to new upstream 3.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Apr 2006 03:07:19 -0000	1.4
+++ sources	2 Sep 2006 21:04:06 -0000	1.5
@@ -1 +1 @@
-57164e52ae4cf67fa21edb062c746f52  nco-3.1.2.tar.gz
+6a24860c89c4546317784b24e802962a  nco-3.1.5.tar.gz