rpms/netcdf/F-13 import.log, NONE, 1.1 netcdf-4.1.1-fflags.patch, NONE, 1.1 netcdf.spec, 1.48, 1.49 netcdf-4.1-beta2-hdf5.patch, 1.1, NONE netcdf-4.1-beta2-libs.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/netcdf/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29427/F-13

Modified Files:
	netcdf.spec 
Added Files:
	import.log netcdf-4.1.1-fflags.patch 
Removed Files:
	netcdf-4.1-beta2-hdf5.patch netcdf-4.1-beta2-libs.patch 
Log Message:
Sync to devel


--- NEW FILE import.log ---
netcdf-4_1_1-2_fc14:F-13:netcdf-4.1.1-2.fc14.src.rpm:1270848211

netcdf-4.1.1-fflags.patch:
 nc-config.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netcdf-4.1.1-fflags.patch ---
--- 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@"


Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/F-13/netcdf.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- netcdf.spec	8 Apr 2010 20:08:27 -0000	1.48
+++ netcdf.spec	9 Apr 2010 21:24:02 -0000	1.49
@@ -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.
 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 
 %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 at cora.nwra.com> - 4.1.1-2
+- Add patch to cleanup nc-config --fflags
+
 * Thu Apr 8 2010 Orion Poplawski <orion at cora.nwra.com> - 4.1.1-1
 - Update to 4.1.1
 


--- netcdf-4.1-beta2-hdf5.patch DELETED ---


--- netcdf-4.1-beta2-libs.patch DELETED ---