From b01c6112f9988b1e2bec881b56a9189103744fc8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Jul 11 2012 21:05:02 +0000
Subject: Update to 4.2.1 rc1

Rebase pkgconfig patch
Drop fflags patch, upstream now calls nf-config

---

diff --git a/.gitignore b/.gitignore
index 93083cd..1487553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ netcdf-4.1.1.tar.gz
 /netcdf-4.2-rc1.tar.gz
 /netcdf-4.2-rc2.tar.gz
 /netcdf-4.2.tar.gz
+/netcdf-4.2.1-rc1.tar.gz
diff --git a/netcdf-fflags.patch b/netcdf-fflags.patch
deleted file mode 100644
index 2ded2a5..0000000
--- a/netcdf-fflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-pkgconfig.patch b/netcdf-pkgconfig.patch
index 5344249..c4a7cb1 100644
--- a/netcdf-pkgconfig.patch
+++ b/netcdf-pkgconfig.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -up netcdf-4.2.1-rc1/nc-config.in.pkgconfig netcdf-4.2.1-rc1/nc-config.in
+--- netcdf-4.2.1-rc1/nc-config.in.pkgconfig	2012-06-18 12:33:10.000000000 -0600
++++ netcdf-4.2.1-rc1/nc-config.in	2012-06-20 16:44:29.292019812 -0600
+@@ -6,12 +6,10 @@
  
  prefix=@prefix@
  exec_prefix=${prefix}
@@ -9,26 +9,17 @@ diff -up netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.pkgconfig netcdf-4.1.3
  includedir=${prefix}/include
  
  cc="@CC@"
-@@ -16,8 +15,6 @@ cxx="@CXX@"
- fc="@FC@"
  cflags=" -I${includedir} @CPPFLAGS@" 
- fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
 -libs="-L${libdir} @NC_LIBS@"
--flibs="-L${libdir} @NC_FLIBS@"
  has_dap="@HAS_DAP@"
  has_nc2="@HAS_NC2@"
  has_nc4="@HAS_NC4@"
-@@ -141,11 +138,11 @@ while test $# -gt 0; do
- 	;;
+@@ -189,7 +187,7 @@ while test $# -gt 0; do
+        	;;
  
       --libs)
 -       	echo $libs
 +       	pkg-config netcdf --libs
         	;;
  
-     --flibs)
--       	echo $flibs
-+       	pkg-config netcdf --flibs
-        	;;
- 
-     --has-dap)
+     --prefix)
diff --git a/netcdf.spec b/netcdf.spec
index d95d699..e3e2583 100644
--- a/netcdf.spec
+++ b/netcdf.spec
@@ -1,17 +1,15 @@
 Name:           netcdf
-Version:        4.2
-Release:        5%{?dist}
+Version:        4.2.1
+Release:        0.1.rc1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
 License:        NetCDF
 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/netcdf-%{version}-rc1.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-pkgconfig.patch
-#Strip FFLAGS from nc-config
-Patch1:         netcdf-fflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  chrpath
@@ -173,9 +171,8 @@ NetCDF parallel openmpi static libraries
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 %patch0 -p1 -b .pkgconfig
-%patch1 -p1 -b .fflags
 
 
 %build
@@ -320,6 +317,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Jul 11 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1-0.1.rc1
+- Update to 4.2.1 rc1
+- Rebase pkgconfig patch
+- Drop fflags patch, upstream now calls nf-config
+
 * Wed Jun 13 2012 Dan Horák <dan[at]danny.cz> - 4.2-5
 - temporarily disable checks on s390 (memory corruption and stuck build)
 
diff --git a/sources b/sources
index 7a1c6e5..7959a49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b920a6c3a30e9cd46fe96d9fb65ef17e  netcdf-4.2.tar.gz
+8fcd4feee01eeb98662504c8f37fba4b  netcdf-4.2.1-rc1.tar.gz