rpms/netcdf/EL-6 import.log, NONE, 1.1 netcdf-4.1-beta2-pkgconfig.patch, NONE, 1.1 netcdf-4.1.1-fflags.patch, NONE, 1.1 netcdf-4.1.1-hdf5.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 netcdf.spec, 1.40, 1.41 sources, 1.9, 1.10 netcdf-4.0.0-gcc4.3-cstring.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Mon May 17 15:33:43 UTC 2010
Author: orion
Update of /cvs/pkgs/rpms/netcdf/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv613/EL-6
Modified Files:
.cvsignore netcdf.spec sources
Added Files:
import.log netcdf-4.1-beta2-pkgconfig.patch
netcdf-4.1.1-fflags.patch netcdf-4.1.1-hdf5.patch
Removed Files:
netcdf-4.0.0-gcc4.3-cstring.patch
Log Message:
Update to 4.1.1 from devel
--- NEW FILE import.log ---
netcdf-4_1_1-3_fc14:EL-6:netcdf-4.1.1-3.fc14.src.rpm:1274110406
netcdf-4.1-beta2-pkgconfig.patch:
nc-config.in | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- NEW FILE netcdf-4.1-beta2-pkgconfig.patch ---
diff -up netcdf-4.1-snapshot2010020100/nc-config.in.pkgconfig netcdf-4.1-snapshot2010020100/nc-config.in
--- netcdf-4.1-snapshot2010020100/nc-config.in.pkgconfig 2010-01-11 12:27:12.000000000 -0700
+++ netcdf-4.1-snapshot2010020100/nc-config.in 2010-02-01 16:04:22.429448744 -0700
@@ -8,7 +8,6 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
includedir=${prefix}/include
cc="@CC@"
@@ -16,8 +15,6 @@ cxx="@CXX@"
fc="@FC@"
cflags=" -I${includedir}"
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@"
@@ -138,11 +135,11 @@ while test $# -gt 0; do
;;
--libs)
- echo $libs
+ pkg-config netcdf --libs
;;
--flibs)
- echo $flibs
+ pkg-config netcdf --flibs
;;
--has-dap)
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@"
netcdf-4.1.1-hdf5.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE netcdf-4.1.1-hdf5.patch ---
diff -up netcdf-4.1.1/libsrc4/Makefile.in.hdf5 netcdf-4.1.1/libsrc4/Makefile.in
--- netcdf-4.1.1/libsrc4/Makefile.in.hdf5 2010-04-19 09:44:45.333650779 -0600
+++ netcdf-4.1.1/libsrc4/Makefile.in 2010-04-19 09:44:45.338649501 -0600
@@ -886,7 +886,7 @@ clean-libLTLIBRARIES:
rm -f "$${dir}/so_locations"; \
done
libnetcdf.la: $(libnetcdf_la_OBJECTS) $(libnetcdf_la_DEPENDENCIES)
- $(libnetcdf_la_LINK) -rpath $(libdir) $(libnetcdf_la_OBJECTS) $(libnetcdf_la_LIBADD) $(LIBS)
+ $(libnetcdf_la_LINK) -rpath $(libdir) $(libnetcdf_la_OBJECTS) $(libnetcdf_la_LIBADD) -lhdf5_hl -lhdf5 $(LIBS)
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/EL-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 16 Apr 2009 17:20:58 -0000 1.9
+++ .cvsignore 17 May 2010 15:33:43 -0000 1.10
@@ -1 +1 @@
-netcdf-4.0.1.tar.gz
+netcdf-4.1.1.tar.gz
Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/EL-6/netcdf.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- netcdf.spec 5 Nov 2009 18:57:50 -0000 1.40
+++ netcdf.spec 17 May 2010 15:33:43 -0000 1.41
@@ -1,43 +1,51 @@
Name: netcdf
-Version: 4.0.1
-Release: 4%{?dist}
+Version: 4.1.1
+Release: 3%{?dist}
Summary: Libraries for the Unidata network Common Data Form
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-%{version}.tar.gz
-Patch0: netcdf-4.0.0-gcc4.3-cstring.patch
+URL: http://www.unidata.ucar.edu/software/netcdf/
+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
+#Explicitly link libnetcdf.so agains -lhdf5_hl -lhdf5, reported upstream
+Patch2: netcdf-4.1.1-hdf5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, gawk
-BuildRequires: hdf5-devel
+BuildRequires: hdf5-devel >= 1.8.4
+BuildRequires: libcurl-devel
+BuildRequires: zlib-devel
BuildRequires: valgrind
%package devel
Summary: Development files for netcdf
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-#Requires: gcc-gfortran%{_isa}
+Requires: gcc-gfortran%{_isa}
Requires: pkgconfig
+Requires: hdf5-devel
+Requires: libcurl-devel
%package static
Summary: Static libs for netcdf
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-
%description
-NetCDF (network Common Data Form) is an interface for array-oriented
-data access and a freely-distributed collection of software libraries
-for C, Fortran, C++, and perl that provides an implementation of the
-interface. The NetCDF library also defines a machine-independent
-format for representing scientific data. Together, the interface,
-library, and format support the creation, access, and sharing of
-scientific data. The NetCDF software was developed at the Unidata
+
+NetCDF (network Common Data Form) is an interface for array-oriented
+data access and a freely-distributed collection of software libraries
+for C, Fortran, C++, and perl that provides an implementation of the
+interface. The NetCDF library also defines a machine-independent
+format for representing scientific data. Together, the interface,
+library, and format support the creation, access, and sharing of
+scientific data. The NetCDF software was developed at the Unidata
Program Center in Boulder, Colorado.
-NetCDF data is:
+NetCDF data is:
o Self-Describing: A NetCDF file includes information about the
data it contains.
@@ -59,7 +67,7 @@ NetCDF data is:
access the same NetCDF file.
%description devel
-This package contains the netCDF header files, shared devel libs, and
+This package contains the netCDF header files, shared devel libs, and
man pages.
%description static
@@ -68,29 +76,37 @@ This package contains the netCDF static
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .pkgconfig
+%patch1 -p1 -b .fflags
+%patch2 -p1 -b .hdf5
%build
-%configure --enable-shared \
+export F77="gfortran"
+export FC="gfortran"
+export FFLAGS="${RPM_OPT_FLAGS}"
+export FCFLAGS="$FFLAGS"
+%configure \
+ --enable-shared \
+ --enable-netcdf-4 \
+ --enable-dap \
+ --enable-ncgen4 \
--enable-extra-example-tests \
- --enable-valgrind-tests
-# parallel build is broken, .mod file hasn't right deps %%{?_smp_mflags}
-make
+ --enable-valgrind-tests \
+ --disable-dap-remote-tests
+#Need to be able to properly list all hdf4 library deps and location
+# --enable-hdf4 \
+
+make #%{?_smp_mflags}
%install
make install DESTDIR=${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf
mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
/bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod \
${RPM_BUILD_ROOT}%{_fmoddir}
-/bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.* \
- ${RPM_BUILD_ROOT}%{_includedir}/netcdf
/bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
/bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-#New with 4.0.1, and not multi-lib compatible
-/bin/rm -f ${RPM_BUILD_ROOT}%{_bindir}/nc-config
%check
@@ -117,15 +133,23 @@ fi
%files
%defattr(-,root,root,-)
%doc COPYRIGHT README
+%{_bindir}/nccopy
%{_bindir}/ncdump
%{_bindir}/ncgen
+%{_bindir}/ncgen3
%{_libdir}/*.so.*
%{_mandir}/man1/*
+%{_datadir}/doc/netcdf
%{_infodir}/*
%files devel
%defattr(-,root,root,-)
-%{_includedir}/netcdf
+%{_bindir}/nc-config
+%{_includedir}/ncvalues.h
+%{_includedir}/netcdf.h
+%{_includedir}/netcdf.hh
+%{_includedir}/netcdf.inc
+%{_includedir}/netcdfcpp.h
%{_fmoddir}/*.mod
%{_libdir}/*.so
%{_libdir}/pkgconfig/netcdf.pc
@@ -137,12 +161,49 @@ fi
%changelog
-* Thu Nov 5 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-4
-- Drop Require: gcc-gfortran for now
+* Mon Apr 19 2010 Orion Poplawski <orion at cora.nwra.com> - 4.1.1-3
+- Explicitly link libnetcdf.so against -lhdf5_hl -lhdf5
+
+* 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
+
+* Fri Feb 5 2010 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-1
+- Update to 4.1.0 final
+
+* Mon Feb 1 2010 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.8.2010020100
+- Update snapshot, pkgconfig patch
+- Re-enable make check
+
+* Sat Dec 5 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.7.2009120100
+- Leave include files in /usr/include
+
+* Tue Dec 1 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.6.2009120100
+- Update snapshot, removes SZIP defines from header
+
+* Fri Nov 13 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.5.2009111309
+- Update snapshot
+- Docs are installed now
+
+* Wed Nov 11 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.5.2009111008
+- Explicitly link libnetcdf to the hdf libraries, don't link with -lcurl
+
+* Wed Nov 11 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.4.2009111008
+- Add Requires: libcurl-devel to devel package
+
+* Wed Nov 11 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.3.2009111008
+- Drop hdf4 support - too problematic with linking all required libraries
+
+* Wed Nov 11 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.2.2009111008
+- Add patch to use proper hdf4 libraries
+- Add Requires: hdf-devel, hdf5-devel to devel package
+- Move nc-config to devel package
-* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-3
-- Don't ship multi-lib incompatible nc-config
-- Require gcc-gfortran for -devel (bug #483469)
+* Wed Nov 11 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.1.2009111008
+- Update to 4.1.0 beta 2 snapshot
+- Enable: netcdf-4, dap, hdf4, ncgen4, a lot more tests
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -219,7 +280,7 @@ fi
- rebuild for gcc4.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)
+- building the library twice (once each for g77 and gfortran)
fixes an annoying problem for people who need both compilers
* Fri Sep 29 2005 Ed Hill <ed at eh3.com> - 3.6.0-7.p1
@@ -256,8 +317,8 @@ fi
* Sat Dec 4 2004 Ed Hill <eh3 at mit.edu> - 0:3.6.0beta6-0.fdr.0
- upgrade to 3.6.0beta6
-- create separate devel package that does *not* depend upon
- the non-devel package and put the headers/libs in "netcdf-3"
+- create separate devel package that does *not* depend upon
+ the non-devel package and put the headers/libs in "netcdf-3"
subdirs for easy co-existance with upcoming netcdf-4
* Thu Dec 2 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.12
@@ -267,7 +328,7 @@ fi
- headers in /usr/include/netcdf, libs in /usr/lib/netcdf
* Mon Oct 4 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.10
-- Put headers in their own directory but leave the libraries in the
+- Put headers in their own directory but leave the libraries in the
%%{_libdir} -- there are only two libs and the majority of other
"*-devel" packages follow this pattern
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/EL-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 16 Apr 2009 17:20:58 -0000 1.9
+++ sources 17 May 2010 15:33:43 -0000 1.10
@@ -1 +1 @@
-a251453c5477599f050fa4e593295186 netcdf-4.0.1.tar.gz
+99cb93a15c4687cb7983e794f4f0ea9e netcdf-4.1.1.tar.gz
--- netcdf-4.0.0-gcc4.3-cstring.patch DELETED ---
More information about the scm-commits
mailing list