From b2b8e6f764f8e78ac2fba6cf128d27c2614c36b4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Feb 05 2011 21:03:18 +0000 Subject: - Fixup more EL5 tests --- diff --git a/nco.spec b/nco.spec index 16a132f..68e8992 100644 --- a/nco.spec +++ b/nco.spec @@ -1,6 +1,6 @@ Name: nco Version: 4.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPLv3 @@ -67,7 +67,7 @@ This package contains the NCO static libs. %endif %build -%if 0%{?rhel} <= 5 +%if 0%{?rhel} && 0%{?rhel} <= 5 export CPPFLAGS="-I%{_includedir}/netcdf-3 -I%{_includedir}/udunits2" %else export CPPFLAGS="-I%{_includedir}/udunits2" @@ -77,7 +77,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC" %configure \ HAVE_ANTLR=yes \ --disable-dependency-tracking --includedir=%{_includedir}/nco \ -%if 0%{?rhel} <= 5 +%if 0%{?rhel} && 0%{?rhel} <= 5 --disable-dap-netcdf \ --enable-dap-opendap %else @@ -133,6 +133,9 @@ fi %{_libdir}/libnco*.a %changelog +* Sat Feb 5 2011 - Orion Poplawski - 4.0.6-2 +- Fixup more EL5 tests + * Sat Feb 5 2011 - Orion Poplawski - 4.0.6-1 - Update to 4.0.6 - Really only use libnc-dap for EL5