[netcdf: 1/2] Update to 4.1.3 Update pkgconfig and fflags patches Drop libm patch fixed upstream

[Orion Poplawski]

commit 38fd9ada8a20d86b8c6050070909b2cfaebfb6fa
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jun 21 10:22:54 2011 -0600

    Update to 4.1.3
    Update pkgconfig and fflags patches
    Drop libm patch fixed upstream

 .gitignore                                         |    1 +
 netcdf-4.1.2-fflags.patch                          |   14 --------------
 netcdf-4.1.2-libm.patch                            |   11 -----------
 netcdf-fflags.patch                                |   12 ++++++++++++
 ...4.1.2-pkgconfig.patch => netcdf-pkgconfig.patch |   10 +++++-----
 netcdf.spec                                        |   16 +++++++++-------
 sources                                            |    2 +-
 7 files changed, 28 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 34b0b4f..9e1a97f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 netcdf-4.1.1.tar.gz
 /netcdf-4.1.2.tar.gz
+/netcdf-4.1.3.tar.gz
diff --git a/netcdf-fflags.patch b/netcdf-fflags.patch
new file mode 100644
index 0000000..2ded2a5
--- /dev/null
+++ b/netcdf-fflags.patch
@@ -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@"
diff --git a/netcdf-4.1.2-pkgconfig.patch b/netcdf-pkgconfig.patch
similarity index 57%
rename from netcdf-4.1.2-pkgconfig.patch
rename to netcdf-pkgconfig.patch
index 761bd5b..5344249 100644
--- a/netcdf-4.1.2-pkgconfig.patch
+++ b/netcdf-pkgconfig.patch
@@ -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@"
diff --git a/netcdf.spec b/netcdf.spec
index fdba586..d464bc3 100644
--- a/netcdf.spec
+++ b/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 at 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 at cora.nwra.com> - 4.1.2-1
 - Update to 4.1.2 (soname bump)
 - Add patch to add -lm to libnetcdf4
diff --git a/sources b/sources
index 6f77609..6788f44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a94ebe2d998d649159aa5665c83fb1a  netcdf-4.1.2.tar.gz
+46a40e1405df19d8cc6ddac16704b05f  netcdf-4.1.3.tar.gz