- Update snapshot, pkgconfig patch

- Re-enable make check
This commit is contained in:
Orion Poplawski 2010-02-01 23:59:52 +00:00
parent ddacba8864
commit b87c46a485
3 changed files with 16 additions and 12 deletions

View File

@ -1,5 +1,6 @@
--- netcdf-4.1-beta2-snapshot2009102000/nc-config.in.pkgconfig 2009-09-24 12:42:06.000000000 -0600
+++ netcdf-4.1-beta2-snapshot2009102000/nc-config.in 2009-10-24 13:22:26.588585310 -0600
diff -up netcdf-4.1-snapshot2010020100/nc-config.in.pkgconfig netcdf-4.1-snapshot2010020100/nc-config.in
--- netcdf-4.1-snapshot2010020100/nc-config.in.pkgconfig 2010-01-11 12:27:12.000000000 -0700
+++ netcdf-4.1-snapshot2010020100/nc-config.in 2010-02-01 16:04:22.429448744 -0700
@@ -8,7 +8,6 @@
prefix=@prefix@
@ -8,7 +9,7 @@
includedir=${prefix}/include
cc="@CC@"
@@ -16,8 +15,6 @@
@@ -16,8 +15,6 @@ cxx="@CXX@"
fc="@FC@"
cflags=" -I${includedir}"
fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
@ -17,10 +18,10 @@
has_dap="@HAS_DAP@"
has_nc2="@HAS_NC2@"
has_nc4="@HAS_NC4@"
@@ -134,11 +131,11 @@
@@ -138,11 +135,11 @@ while test $# -gt 0; do
;;
--libs)
--libs)
- echo $libs
+ pkg-config netcdf --libs
;;

View File

@ -1,6 +1,6 @@
Name: netcdf
Version: 4.1.0
Release: 0.7.2009120100%{?dist}
Release: 0.8.2010020100%{?dist}
Summary: Libraries for the Unidata network Common Data Form
Group: Applications/Engineering
@ -9,7 +9,7 @@ URL: http://www.unidata.ucar.edu/software/netcdf/
#Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%{version}.tar.gz
Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/snapshot/netcdf-4-daily.tar.gz
#Use pkgconfig in nc-config to avoid multi-lib issues
Patch2: netcdf-4.1-beta2-pkgconfig.patch
Patch0: netcdf-4.1-beta2-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, gawk
@ -73,9 +73,8 @@ This package contains the netCDF static libs.
%prep
%setup -q -n netcdf-4.1-snapshot2009120100
autoreconf
%patch2 -p1 -b .pkgconfig
%setup -q -n netcdf-4.1-snapshot2010020100
%patch0 -p1 -b .pkgconfig
%build
@ -107,7 +106,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
%check
#make check
make check
%clean
@ -158,6 +157,10 @@ fi
%changelog
* Mon Feb 1 2010 Orion Poplawski <orion@cora.nwra.com> - 4.1.0-0.8.2010020100
- Update snapshot, pkgconfig patch
- Re-enable make check
* Sat Dec 5 2009 Orion Poplawski <orion@cora.nwra.com> - 4.1.0-0.7.2009120100
- Leave include files in /usr/include

View File

@ -1 +1 @@
eea442bdfd3119dcb3d6f3e245535eda netcdf-4-daily.tar.gz
3109dda8ccf27d7e93cf58e9d1c84830 netcdf-4-daily.tar.gz