rpms/netcdf/FC-4 .cvsignore, 1.4, 1.5 netcdf.spec, 1.11, 1.12 sources, 1.4, 1.5

[Ed Hill (edhill)]

Author: edhill

Update of /cvs/extras/rpms/netcdf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344/FC-4

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update to upstream 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2005 03:33:33 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:32:55 -0000	1.5
@@ -1 +1 @@
-netcdf-3.6.0-p1.tar.gz
+netcdf-3.6.1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/netcdf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- netcdf.spec	16 Oct 2005 06:11:55 -0000	1.11
+++ netcdf.spec	22 Apr 2006 02:32:55 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           netcdf
-Version:        3.6.0
-Release:        8.p1%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
@@ -53,13 +53,14 @@
 
 
 %prep
-%setup -q -n netcdf-3.6.0-p1
+%setup -q
 
 
 %build
 cd src
-export FC="gfortran"
-export CPPFLAGS="-fPIC"
+export FC="g77"
+export F90=
+export CPPFLAGS="-fPIC -Df2cFortran"
 export FFLAGS="-fPIC"
 %configure
 #  WARNING!
@@ -69,7 +70,9 @@
 mkdir lib_g77
 cp libsrc/libnetcdf.a lib_g77
 make clean
-CPPFLAGS="-fPIC -DpgiFortran"
+export FC="gfortran"
+export F90="gfortran"
+export CPPFLAGS="-fPIC -DpgiFortran"
 %configure
 make
 #  The below seems to work but I worry that it would lead to odd runtime
@@ -78,6 +81,7 @@
 #  one for the older g77 and one for gfortran.
 #    ar cru libsrc/libnetcdf.a lib_g77/libnetcdf.a
 unset FC
+unset F90
 unset CPPFLAGS
 unset FFLAGS
 
@@ -116,6 +120,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.6.1-1
+- update to upstream 3.6.1
+
 * Sun Oct 16 2005 Ed Hill <ed at eh3.com> - 3.6.0-8.p1
 - building the library twice (once each for g77 and gfortran) 
   fixes an annoying problem for people who need both compilers


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2005 03:33:33 -0000	1.4
+++ sources	22 Apr 2006 02:32:55 -0000	1.5
@@ -1 +1 @@
-27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz
+07a9db424337c5e4833fb84136e09a1e  netcdf-3.6.1.tar.gz