Update to 4.1.3
Update pkgconfig and fflags patches Drop libm patch fixed upstream
This commit is contained in:
parent
5ace19ab71
commit
38fd9ada8a
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
netcdf-4.1.1.tar.gz
|
||||
/netcdf-4.1.2.tar.gz
|
||||
/netcdf-4.1.3.tar.gz
|
||||
|
@ -1,14 +0,0 @@
|
||||
diff -up netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in.fflags netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in
|
||||
--- netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in.fflags 2010-12-03 10:03:38.000000000 -0700
|
||||
+++ netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in 2010-12-03 10:04:26.594466933 -0700
|
||||
@@ -13,8 +13,8 @@ includedir=${prefix}/include
|
||||
cc="@CC@"
|
||||
cxx="@CXX@"
|
||||
fc="@FC@"
|
||||
-cflags=" -I${includedir} @EXTERN_CPPFLAGS@"
|
||||
-fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
|
||||
+cflags="-I${includedir} @EXTERN_CPPFLAGS@"
|
||||
+fflags="@MOD_FLAG@${includedir}"
|
||||
has_dap="@HAS_DAP@"
|
||||
has_nc2="@HAS_NC2@"
|
||||
has_nc4="@HAS_NC4@"
|
@ -1,11 +0,0 @@
|
||||
--- netcdf-4.1.2/libsrc4/Makefile.in.libm 2011-03-29 17:14:04.000000000 -0600
|
||||
+++ netcdf-4.1.2/libsrc4/Makefile.in 2011-03-31 11:09:36.683165942 -0600
|
||||
@@ -312,7 +312,7 @@
|
||||
# Tell libtool what libraries are we will depend on.
|
||||
|
||||
# Always link to hdf5_hl, hdf5, and z.
|
||||
-libnetcdf4_la_LIBADD = $(am__append_12) $(am__append_13) -lhdf5_hl \
|
||||
+libnetcdf4_la_LIBADD = -lm $(am__append_12) $(am__append_13) -lhdf5_hl \
|
||||
-lhdf5 -lz
|
||||
all: all-am
|
||||
|
12
netcdf-fflags.patch
Normal file
12
netcdf-fflags.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.fflags netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in
|
||||
--- netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.fflags 2011-05-27 15:05:06.000000000 -0600
|
||||
+++ netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in 2011-05-27 15:06:08.066331777 -0600
|
||||
@@ -14,7 +14,7 @@ cc="@CC@"
|
||||
cxx="@CXX@"
|
||||
fc="@FC@"
|
||||
cflags=" -I${includedir} @CPPFLAGS@"
|
||||
-fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
|
||||
+fflags="@MOD_FLAG@${includedir}"
|
||||
has_dap="@HAS_DAP@"
|
||||
has_nc2="@HAS_NC2@"
|
||||
has_nc4="@HAS_NC4@"
|
@ -1,6 +1,6 @@
|
||||
diff -up netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in.pkgconfig netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in
|
||||
--- netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in.pkgconfig 2010-12-02 22:20:11.000000000 -0700
|
||||
+++ netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in 2010-12-03 10:02:30.598407327 -0700
|
||||
diff -up netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.pkgconfig netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in
|
||||
--- netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.pkgconfig 2011-05-26 20:23:15.000000000 -0600
|
||||
+++ netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in 2011-05-27 15:04:12.823601895 -0600
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
prefix=@prefix@
|
||||
@ -11,9 +11,9 @@ diff -up netcdf-4.1.2-beta2-snapshot2010120222/nc-config.in.pkgconfig netcdf-4.1
|
||||
cc="@CC@"
|
||||
@@ -16,8 +15,6 @@ cxx="@CXX@"
|
||||
fc="@FC@"
|
||||
cflags=" -I${includedir} @EXTERN_CPPFLAGS@"
|
||||
cflags=" -I${includedir} @CPPFLAGS@"
|
||||
fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
|
||||
-libs="-L${libdir} @NC_LIBS@ @EXTERN_LDFLAGS@"
|
||||
-libs="-L${libdir} @NC_LIBS@"
|
||||
-flibs="-L${libdir} @NC_FLIBS@"
|
||||
has_dap="@HAS_DAP@"
|
||||
has_nc2="@HAS_NC2@"
|
16
netcdf.spec
16
netcdf.spec
@ -1,5 +1,5 @@
|
||||
Name: netcdf
|
||||
Version: 4.1.2
|
||||
Version: 4.1.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Libraries for the Unidata network Common Data Form
|
||||
|
||||
@ -9,11 +9,9 @@ URL: http://www.unidata.ucar.edu/software/netcdf/
|
||||
Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-%{version}.tar.gz
|
||||
#Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/snapshot/netcdf-4-daily.tar.gz
|
||||
#Use pkgconfig in nc-config to avoid multi-lib issues
|
||||
Patch0: netcdf-4.1.2-pkgconfig.patch
|
||||
Patch0: netcdf-pkgconfig.patch
|
||||
#Strip FFLAGS from nc-config
|
||||
Patch1: netcdf-4.1.2-fflags.patch
|
||||
# Need to add -lm to libnetcdf4
|
||||
Patch2: netcdf-4.1.2-libm.patch
|
||||
Patch1: netcdf-fflags.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: gcc-gfortran, gawk
|
||||
@ -79,10 +77,9 @@ This package contains the netCDF static libs.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n %{name}-%{version}-rc1-snapshot2011052620
|
||||
%patch0 -p1 -b .pkgconfig
|
||||
%patch1 -p1 -b .fflags
|
||||
%patch2 -p1 -b .libm
|
||||
|
||||
|
||||
%build
|
||||
@ -160,6 +157,11 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jun 21 2011 Orion Poplawski <orion@cora.nwra.com> - 4.1.3-1
|
||||
- Update to 4.1.3
|
||||
- Update pkgconfig and fflags patches
|
||||
- Drop libm patch fixed upstream
|
||||
|
||||
* Thu Mar 31 2011 Orion Poplawski <orion@cora.nwra.com> - 4.1.2-1
|
||||
- Update to 4.1.2 (soname bump)
|
||||
- Add patch to add -lm to libnetcdf4
|
||||
|
Loading…
Reference in New Issue
Block a user