packages: netcdf/netcdf-info.patch, netcdf/netcdf.spec - updated to 4.1.1 (...
qboosh
qboosh at pld-linux.org
Sat Oct 9 07:38:57 CEST 2010
Author: qboosh Date: Sat Oct 9 05:38:57 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 4.1.1 (new sonames)
- updated info patch
- build with netcdf-4 and dap support
---- Files affected:
packages/netcdf:
netcdf-info.patch (1.2 -> 1.3) , netcdf.spec (1.32 -> 1.33)
---- Diffs:
================================================================
Index: packages/netcdf/netcdf-info.patch
diff -u packages/netcdf/netcdf-info.patch:1.2 packages/netcdf/netcdf-info.patch:1.3
--- packages/netcdf/netcdf-info.patch:1.2 Thu Apr 23 21:36:33 2009
+++ packages/netcdf/netcdf-info.patch Sat Oct 9 07:38:51 2010
@@ -26,20 +26,6 @@
@end direntry
@end ifinfo
---- netcdf-4.0.1/man4/netcdf-cxx4.texi.orig 2008-08-06 19:01:14.000000000 +0200
-+++ netcdf-4.0.1/man4/netcdf-cxx4.texi 2009-04-23 21:04:49.045722188 +0200
-@@ -17,9 +17,9 @@
- @include defines.texi
-
- @ifinfo
-- at dircategory netCDF scientific data format
-+ at dircategory Libraries:
- @direntry
--* netcdf-cxx4: (netcdf-cxx4). @value{cxx4-man}
-+* netcdf-cxx4: (netcdf-cxx4). @value{cxx4-man}
- @end direntry
- @end ifinfo
-
--- netcdf-4.0.1/man4/netcdf-f77.texi.orig 2008-01-29 19:22:51.000000000 +0100
+++ netcdf-4.0.1/man4/netcdf-f77.texi 2008-11-01 12:42:21.152734968 +0100
@@ -16,9 +16,9 @@
================================================================
Index: packages/netcdf/netcdf.spec
diff -u packages/netcdf/netcdf.spec:1.32 packages/netcdf/netcdf.spec:1.33
--- packages/netcdf/netcdf.spec:1.32 Thu Apr 23 21:37:06 2009
+++ packages/netcdf/netcdf.spec Sat Oct 9 07:38:52 2010
@@ -7,20 +7,22 @@
Summary: NetCDF: Network Common Data Form
Summary(pl.UTF-8): NetCDF: obsługa wspólnego sieciowego formatu danych
Name: netcdf
-Version: 4.0.1
+Version: 4.1.1
Release: 1
License: BSD-like
Group: Libraries
Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-%{version}.tar.gz
-# Source0-md5: a251453c5477599f050fa4e593295186
+# Source0-md5: 79c5ff14c80d5e18dd8f1fceeae1c8e1
Patch0: %{name}-info.patch
URL: http://www.unidata.ucar.edu/packages/netcdf/
BuildRequires: automake
+BuildRequires: curl-devel
%if %{with f90}
BuildRequires: gcc-fortran >= 5:4.0
%else
BuildRequires: gcc-g77
%endif
+BuildRequires: hdf5-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.5
BuildRequires: texinfo
@@ -163,12 +165,10 @@
CPPFLAGS="-DgFortran=1"
%configure \
FCFLAGS="%{rpmcflags}" \
+ --enable-dap \
+ --enable-netcdf-4 \
--enable-shared
-# TODO (linking broken; BR: curl-devel, hdf5-devel, maybe szip-devel, libxml2-devel):
-# --enable-dap \
-# --enable-netcdf-4 \
-
%{__make}
%if %{with tests}
@@ -178,12 +178,11 @@
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C libsrc install \
- DESTDIR=$RPM_BUILD_ROOT
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/netcdf
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -217,12 +216,16 @@
%files
%defattr(644,root,root,755)
%doc COPYRIGHT README RELEASE_NOTES man4/netcdf.html
+%attr(755,root,root) %{_bindir}/nccopy
%attr(755,root,root) %{_bindir}/ncdump
%attr(755,root,root) %{_bindir}/ncgen
+%attr(755,root,root) %{_bindir}/ncgen3
%attr(755,root,root) %{_libdir}/libnetcdf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnetcdf.so.4
+%attr(755,root,root) %ghost %{_libdir}/libnetcdf.so.6
+%{_mandir}/man1/nccopy.1*
%{_mandir}/man1/ncdump.1*
%{_mandir}/man1/ncgen.1*
+%{_mandir}/man1/ncgen3.1*
%files devel
%defattr(644,root,root,755)
@@ -245,7 +248,7 @@
%files c++
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnetcdf_c++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnetcdf_c++.so.4
+%attr(755,root,root) %ghost %{_libdir}/libnetcdf_c++.so.5
%files c++-devel
%defattr(644,root,root,755)
@@ -256,7 +259,6 @@
%{_includedir}/netcdf.hh
%{_includedir}/netcdfcpp.h
%{_infodir}/netcdf-cxx.info*
-%{_infodir}/netcdf-cxx4.info*
%files c++-static
%defattr(644,root,root,755)
@@ -265,7 +267,7 @@
%files fortran
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnetcdff.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnetcdff.so.4
+%attr(755,root,root) %ghost %{_libdir}/libnetcdff.so.5
%files fortran-devel
%defattr(644,root,root,755)
@@ -292,6 +294,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2010/10/09 05:38:52 qboosh
+- updated to 4.1.1 (new sonames)
+- updated info patch
+- build with netcdf-4 and dap support
+
Revision 1.32 2009/04/23 19:37:06 qboosh
- updated to 4.0.1
- updated info patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netcdf/netcdf-info.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netcdf/netcdf.spec?r1=1.32&r2=1.33&f=u
More information about the pld-cvs-commit
mailing list