rpms/netcdf/FC-5 .cvsignore, 1.4, 1.5 netcdf.spec, 1.13, 1.14 sources, 1.4, 1.5
Ed Hill (edhill)
fedora-extras-commits at redhat.com
Sat Apr 22 02:32:56 UTC 2006
- Previous message: rpms/netcdf/FC-4 .cvsignore, 1.4, 1.5 netcdf.spec, 1.11, 1.12 sources, 1.4, 1.5
- Next message: rpms/netcdf/devel .cvsignore, 1.4, 1.5 netcdf.spec, 1.13, 1.14 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: edhill
Update of /cvs/extras/rpms/netcdf/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344/FC-5
Modified Files:
.cvsignore netcdf.spec sources
Log Message:
update to upstream 3.6.1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-5/.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:56 -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-5/netcdf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- netcdf.spec 17 Feb 2006 02:45:55 -0000 1.13
+++ netcdf.spec 22 Apr 2006 02:32:56 -0000 1.14
@@ -1,12 +1,12 @@
Name: netcdf
-Version: 3.6.0
-Release: 10.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
+
* Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.6.0-10.p1
- rebuild for new GCC
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-5/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:56 -0000 1.5
@@ -1 +1 @@
-27c193e0462d9979406d167a01a5ee95 netcdf-3.6.0-p1.tar.gz
+07a9db424337c5e4833fb84136e09a1e netcdf-3.6.1.tar.gz
- Previous message: rpms/netcdf/FC-4 .cvsignore, 1.4, 1.5 netcdf.spec, 1.11, 1.12 sources, 1.4, 1.5
- Next message: rpms/netcdf/devel .cvsignore, 1.4, 1.5 netcdf.spec, 1.13, 1.14 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list