rpms/netcdf/EL-5 netcdf-3.6.2-gcc43.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 netcdf.spec, 1.17, 1.18 sources, 1.5, 1.6
Orion Poplawski
orion at fedoraproject.org
Wed Oct 22 15:23:12 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/netcdf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4208
Modified Files:
.cvsignore netcdf.spec sources
Added Files:
netcdf-3.6.2-gcc43.patch
Log Message:
Sync from F-9 branch - upgrade to 3.6.2 to get shared libraries.
netcdf-3.6.2-gcc43.patch:
--- NEW FILE netcdf-3.6.2-gcc43.patch ---
--- netcdf-3.6.2/cxx/ncvalues.cpp.gcc43 2006-12-29 09:38:56.000000000 -0700
+++ netcdf-3.6.2/cxx/ncvalues.cpp 2008-04-02 13:45:39.000000000 -0600
@@ -9,7 +9,7 @@
#include <config.h>
#include <iostream>
-#include <string>
+#include <cstring>
#include "ncvalues.h"
--- netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp.gcc43 2007-01-19 05:52:13.000000000 -0700
+++ netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp 2008-04-02 13:46:08.000000000 -0600
@@ -18,6 +18,7 @@
#include <iostream>
#include <netcdfcpp.h>
+#include <cstring>
using namespace std;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 22 Apr 2006 02:32:57 -0000 1.5
+++ .cvsignore 22 Oct 2008 15:22:42 -0000 1.6
@@ -1 +1 @@
-netcdf-3.6.1.tar.gz
+netcdf-3.6.2.tar.bz2
Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/EL-5/netcdf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- netcdf.spec 2 Sep 2006 16:12:55 -0000 1.17
+++ netcdf.spec 22 Oct 2008 15:22:42 -0000 1.18
@@ -1,22 +1,28 @@
Name: netcdf
-Version: 3.6.1
-Release: 4%{?dist}
+Version: 3.6.2
+Release: 7%{?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.1.tar.gz
+Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.2.tar.bz2
+Patch0: netcdf-3.6.2-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-gfortran
-BuildRequires: compat-gcc-34-g77
+BuildRequires: gcc-gfortran, gawk
+# BuildRequires: compat-gcc-34-g77
%package devel
Summary: Development files for netcdf-3
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+%package static
+Summary: Static libs for netcdf-3
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
%description
NetCDF-3 (network Common Data Form ver3) is an interface for
array-oriented data access and a freely-distributed collection of
@@ -49,78 +55,95 @@
access the same NetCDF file.
%description devel
-This package contains the netCDF-3 header files, static libs, and man
-pages.
+This package contains the netCDF-3 header files, shared devel libs, and
+man pages.
+%description static
+This package contains the netCDF-3 static libs.
%prep
%setup -q
-
+%patch0 -p1 -b .gcc43
%build
-cd src
-export FC="g77"
-export F90=
-export CPPFLAGS="-fPIC -Df2cFortran"
-export FFLAGS="-fPIC"
-%configure
-# WARNING!
-# The parallel build was tested and it does NOT work.
-# make %{?_smp_mflags}
-make
-mkdir lib_g77
-cp libsrc/libnetcdf.a lib_g77
-make clean
export FC="gfortran"
export F90="gfortran"
-export CPPFLAGS="-fPIC -DpgiFortran"
-%configure
+export CPPFLAGS="-fPIC"
+export FFLAGS="-fPIC ${RPM_OPT_FLAGS}"
+export F90FLAGS="$FFLAGS"
+export FCFLAGS="$FFLAGS"
+%configure --enable-shared
make
-# The below seems to work but I worry that it would lead to odd runtime
-# errors due to possible symbol collisions in the "cfortran.h" bits.
-# The safer thing to do is to simply build and install two libraries,
-# 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
%install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir ${RPM_BUILD_ROOT}
+%makeinstall
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}
-cd src
-%makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
- LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
- MANDIR=${RPM_BUILD_ROOT}%{_mandir}
-cp lib_g77/libnetcdf.a ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3/libnetcdf_g77.a
-rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f*
-find ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 -type f | xargs chmod 644
-find ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 -type f | xargs chmod 644
-find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
+/bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.* \
+ ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3
+/bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
+#
+# Does the /usr/include/netcdf-3/netcdf.mod file really belong in
+# /usr/include/netcdf-3/ or should it go in /usr/lib/netcdf-3 ???
+# I suppose this should be decided on after some testing since the
+# gfortran *.mod file appears to be ACSII text, not a binary file.
+#
+# mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3
+# /bin/mv -f ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3/*.mod
+# ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3
+
+
+%check
+make check
+
%clean
rm -rf ${RPM_BUILD_ROOT}
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
-%doc src/COPYRIGHT src/README
+%doc COPYRIGHT README
%{_bindir}/*
+%{_libdir}/*.so.*
%{_mandir}/man1/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/netcdf-3
-%{_libdir}/netcdf-3
+%{_libdir}/*.so
%{_mandir}/man3/*
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/*.a
+
%changelog
+* Wed Apr 2 2008 Orion Poplawski <orion at cora.nwra.com> - 3.6.2-7
+- Change patch to include <cstring>
+- Remove %%{?_smp_mflags} - not parallel build safe (fortran modules)
+
+* Wed Feb 20 2008 Ed Hill <ed at eh3.com> - 3.6.2-6
+- add patch that (hopefully?) allows the GCC 4.3 build to proceed
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.6.2-5
+- Autorebuild for GCC 4.3
+
+* Sat Aug 25 2007 Ed Hill <ed at eh3.com> - 3.6.2-4
+- add BR: gawk
+
+* Sat Aug 25 2007 Ed Hill <ed at eh3.com> - 3.6.2-3
+- rebuild for BuildID
+
+* Mon May 21 2007 Orion Poplawski <orion at cora.nwra.com> - 3.6.2-2
+- Run checks
+
+* Sat Mar 17 2007 Ed Hill <ed at eh3.com> - 3.6.2-1
+- 3.6.2 has a new build system supporting shared libs
+
* Sat Sep 2 2006 Ed Hill <ed at eh3.com> - 3.6.1-4
- switch to compat-gcc-34-g77 instead of compat-gcc-32-g77
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 22 Apr 2006 02:32:57 -0000 1.5
+++ sources 22 Oct 2008 15:22:42 -0000 1.6
@@ -1 +1 @@
-07a9db424337c5e4833fb84136e09a1e netcdf-3.6.1.tar.gz
+1eca0ea1e81e14ebc5bb93e5dd25c364 netcdf-3.6.2.tar.bz2
More information about the fedora-extras-commits
mailing list