From 215263d38b8677671fdb336e21c2354000fb967b Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Fri, 9 Apr 2010 21:24:02 +0000
Subject: [PATCH] Sync to devel

---
 import.log                  |  1 +
 netcdf-4.1-beta2-hdf5.patch | 11 -----------
 netcdf-4.1-beta2-libs.patch | 38 -------------------------------------
 netcdf-4.1.1-fflags.patch   | 13 +++++++++++++
 netcdf.spec                 |  7 ++++++-
 5 files changed, 20 insertions(+), 50 deletions(-)
 create mode 100644 import.log
 delete mode 100644 netcdf-4.1-beta2-hdf5.patch
 delete mode 100644 netcdf-4.1-beta2-libs.patch
 create mode 100644 netcdf-4.1.1-fflags.patch

diff --git a/import.log b/import.log
new file mode 100644
index 0000000..d7c3b17
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+netcdf-4_1_1-2_fc14:F-13:netcdf-4.1.1-2.fc14.src.rpm:1270848211
diff --git a/netcdf-4.1-beta2-hdf5.patch b/netcdf-4.1-beta2-hdf5.patch
deleted file mode 100644
index 36aa489..0000000
--- a/netcdf-4.1-beta2-hdf5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- netcdf-4.1-snapshot2009111008/libsrc4/Makefile.in.hdf5	2009-11-10 08:38:09.000000000 -0700
-+++ netcdf-4.1-snapshot2009111008/libsrc4/Makefile.in	2009-11-11 16:58:44.846340629 -0700
-@@ -791,7 +791,7 @@
- # Our output library will also include contents of the netcdf3
- # convenience library.
- libnetcdf_la_LIBADD = ../libsrc/libnetcdf3.la $(am__append_11) \
--	$(am__append_12) $(am__append_13)
-+	$(am__append_12) $(am__append_13) -lhdf5_hl -lhdf5
- @BUILD_V2_TRUE@TST_V2 = tst_v2 
- 
- # Netcdf-4 source.
diff --git a/netcdf-4.1-beta2-libs.patch b/netcdf-4.1-beta2-libs.patch
deleted file mode 100644
index c57f7e1..0000000
--- a/netcdf-4.1-beta2-libs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- netcdf-4.1-snapshot2009111008/configure.libs	2009-11-10 08:38:04.000000000 -0700
-+++ netcdf-4.1-snapshot2009111008/configure	2009-11-11 20:24:32.932280524 -0700
-@@ -3420,7 +3420,7 @@
-   curl_cflags="-I$with_curl/include"
-   curl_dir="$with_curl"
- else
--  curl_cflags=-lcurl
-+  curl_cflags=
-   curl_libs=
-   curl_dir=
- fi
-@@ -31317,7 +31317,7 @@
-    LDFLAGS="${LDFLAGS} -L${HDF5DIR}/lib"
-    CPPFLAGS="${CPPFLAGS} -I${HDF5DIR}/include"
- fi
--LIBS="${LIBS} -lm -lz -lhdf5"
-+LIBS="${LIBS} -lz -lhdf5"
- 
- # Add the HDF4 directory and library if needed.
- if test "x$enable_hdf4" = xyes; then
-@@ -33122,7 +33122,7 @@
-    if test "x$ZLIBDIR" != x ; then
-       NC_LIBS="$NC_LIBS -L$ZLIBDIR/lib"
-    fi
--   NC_LIBS="$NC_LIBS -lz -lm $LIBS"
-+   NC_LIBS="$NC_LIBS -lz $LIBS"
-    if test "x$SZLIBDIR" != x ; then
-       NC_LIBS="$NC_LIBS -L$SZLIBDIR/lib"
-       NC_LIBS="$NC_LIBS -lsz $LIBS"
-@@ -33138,7 +33138,7 @@
-     if test "x$with_daplib" != x ; then
-        NC_LIBS="$NC_LIBS -L$with_daplib/lib"
-     fi
--    NC_LIBS="$NC_LIBS $CURL_LIBS"
-+    NC_LIBS="$NC_LIBS"
- fi
- if test "x$enable_separate_fortran" = xyes ; then
-    NC_FLIBS="-lnetcdff $NC_LIBS"
diff --git a/netcdf-4.1.1-fflags.patch b/netcdf-4.1.1-fflags.patch
new file mode 100644
index 0000000..9a8ff0d
--- /dev/null
+++ b/netcdf-4.1.1-fflags.patch
@@ -0,0 +1,13 @@
+--- netcdf-4.1.1/nc-config.in.fflags	2010-04-08 14:05:40.063132547 -0600
++++ netcdf-4.1.1/nc-config.in	2010-04-09 13:53:26.923928260 -0600
+@@ -13,8 +13,8 @@
+ cc="@CC@"
+ cxx="@CXX@"
+ fc="@FC@"
+-cflags=" -I${includedir}"
+-fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
++cflags="-I${includedir}"
++fflags="@MOD_FLAG@${includedir}"
+ has_dap="@HAS_DAP@"
+ has_nc2="@HAS_NC2@"
+ has_nc4="@HAS_NC4@"
diff --git a/netcdf.spec b/netcdf.spec
index 8dfdc15..389dc79 100644
--- a/netcdf.spec
+++ b/netcdf.spec
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -9,6 +9,7 @@ URL:            http://www.unidata.ucar.edu/software/netcdf/
 Source0:        http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-4.1.1.tar.gz
 #Use pkgconfig in nc-config to avoid multi-lib issues
 Patch0:         netcdf-4.1-beta2-pkgconfig.patch
+Patch1:         netcdf-4.1.1-fflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, gawk
@@ -74,6 +75,7 @@ This package contains the netCDF static libs.
 %prep
 %setup -q
 %patch0 -p1 -b .pkgconfig
+%patch1 -p1 -b .fflags
 
 
 %build
@@ -156,6 +158,9 @@ fi
 
 
 %changelog
+* Fri Apr 9 2010 Orion Poplawski <orion@cora.nwra.com> - 4.1.1-2
+- Add patch to cleanup nc-config --fflags
+
 * Thu Apr 8 2010 Orion Poplawski <orion@cora.nwra.com> - 4.1.1-1
 - Update to 4.1.1