Author: qboosh Date: Tue Mar 20 19:54:16 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 4.2
- removed obsolete szip patch; info and f90 patches no longer applicable here
- fortran and c++ bindings moved to separate packages
(netcdf-{fortran,cxx,cxx4}.spec)
---- Files affected:
packages/netcdf:
netcdf.spec (1.39 -> 1.40) , netcdf-f90.patch (1.1 -> NONE) (REMOVED),
netcdf-info.patch (1.3 -> NONE) (REMOVED), netcdf-szip.patch (1.1 -> NONE)
(REMOVED)
---- Diffs:
================================================================
Index: packages/netcdf/netcdf.spec
diff -u packages/netcdf/netcdf.spec:1.39 packages/netcdf/netcdf.spec:1.40
--- packages/netcdf/netcdf.spec:1.39 Mon Sep 12 10:24:08 2011
+++ packages/netcdf/netcdf.spec Tue Mar 20 20:54:11 2012
@@ -1,7 +1,6 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_without f90 # don't build Fortran 90 interface (just
builtin F77)
%bcond_without tests # don't perform "make check"
# (note: tests need endoder-enabled szip)
%bcond_with tests_net # remote tests (Internet access required)
@@ -9,27 +8,20 @@
Summary: NetCDF: Network Common Data Form
Summary(pl.UTF-8): NetCDF: obsługa wspólnego sieciowego formatu danych
Name: netcdf
-Version: 4.1.3
-Release: 2
+Version: 4.2
+Release: 1
License: BSD-like
Group: Libraries
Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-%{version}.tar.gz
-# Source0-md5: 46a40e1405df19d8cc6ddac16704b05f
-Patch0: %{name}-info.patch
-Patch1: %{name}-szip.patch
-Patch2: %{name}-f90.patch
+# Source0-md5: 93e675a50d9bfd2709429f88f0f4e71f
URL: http://www.unidata.ucar.edu/packages/netcdf/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: curl-devel
-%if %{with f90}
-BuildRequires: gcc-fortran >= 5:4.0
-%else
-BuildRequires: gcc-g77
-%endif
+BuildRequires: doxygen
BuildRequires: hdf5-devel >= 1.8.5
BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:2.4
+BuildRequires: libtool >= 2:2.2
BuildRequires: szip-devel >= 2.1-2
BuildRequires: texinfo
Requires: hdf5 >= 1.8.5
@@ -82,125 +74,22 @@
%description static -l pl.UTF-8
Statyczna wersja biblioteki netCDF dla C.
-%package c++
-Summary: NetCDF - C++ library
-Summary(pl.UTF-8): Biblioteka C++ netCDF
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description c++
-NetCDF - C++ library.
-
-%description c++ -l pl.UTF-8
-Biblioteka C++ netCDF.
-
-%package c++-devel
-Summary: Header files for netCDF C++ interface
-Summary(pl.UTF-8): Pliki nagłówkowe interfejsu C++ netCDF
-Group: Development/Libraries
-Requires: %{name}-c++ = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
-Requires: libstdc++-devel
-
-%description c++-devel
-Header files for netCDF C++ interface.
-
-%description c++-devel -l pl.UTF-8
-Pliki nagłówkowe interfejsu C++ netCDF.
-
-%package c++-static
-Summary: NetCDF - C++ static library
-Summary(pl.UTF-8): Statyczna biblioteka C++ netCDF
-Group: Development/Libraries
-Requires: %{name}-c++-devel = %{version}-%{release}
-
-%description c++-static
-NetCDF - C++ static library.
-
-%description c++-static -l pl.UTF-8
-Statyczna biblioteka C++ netCDF.
-
-%package fortran
-Summary: NetCDF - Fortran library
-Summary(pl.UTF-8): Biblioteka Fortranu netCDF
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: netcdf-f90
-
-%description fortran
-NetCDF - Fortran 77%{?with f90: and 90} library.
-
-%description fortran -l pl.UTF-8
-Biblioteka Fortranu 77%{?with_f90: i 90} netCDF.
-
-%package fortran-devel
-Summary: Header files for netCDF Fortran interface
-Summary(pl.UTF-8): Pliki nagłówkowe interfejsu Fortranu netCDF
-Group: Development/Libraries
-Requires: %{name}-fortran = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
-%if %{with f90}
-Requires: gcc-fortran >= 5:4.0
-%else
-Requires: gcc-g77
-%endif
-Obsoletes: netcdf-f90-devel
-
-%description fortran-devel
-Header files for netCDF Fortran interface.
-
-%description fortran-devel -l pl.UTF-8
-Pliki nagłówkowe interfejsu Fortranu netCDF.
-
-%package fortran-static
-Summary: NetCDF - Fortran static library
-Summary(pl.UTF-8): Statyczna biblioteka Fortranu netCDF
-Group: Development/Libraries
-Requires: %{name}-fortran-devel = %{version}-%{release}
-Obsoletes: netcdf-f90-static
-
-%description fortran-static
-NetCDF - Fortran static library.
-
-%description fortran-static -l pl.UTF-8
-Statyczna biblioteka Fortranu netCDF.
-
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
-cd udunits
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
-cd ../libcf
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd ..
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-CPPFLAGS="%{rpmcppflags} -DgFortran=1"
%configure \
- FCFLAGS="%{rpmcflags}" \
%{!?with_tests_net:--disable-dap-remote-tests} \
- --enable-cxx-4 \
--enable-dap \
--enable-netcdf-4 \
- --enable-shared
-# --enable-cdmremote doesn't build atm. (tested on 4.1.3)
+# --enable-cdmremote doesn't build atm. (tested on 4.2)
+# --enable-rpc the same
# --enable-hdf4 would cause dependency loop (hdf4 requires netcdf)
-# --with-libcf refers to symbols not included in its code (nctime.c) (tested
on 4.1.3)
%{__make}
@@ -220,33 +109,9 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post devel -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%postun devel -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%post c++ -p /sbin/ldconfig
-%postun c++ -p /sbin/ldconfig
-
-%post c++-devel -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%postun c++-devel -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%post fortran -p /sbin/ldconfig
-%postun fortran -p /sbin/ldconfig
-
-%post fortran-devel -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%postun fortran-devel -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
%files
%defattr(644,root,root,755)
-%doc COPYRIGHT README RELEASE_NOTES man4/netcdf.html
+%doc COPYRIGHT README RELEASE_NOTES
%attr(755,root,root) %{_bindir}/nccopy
%attr(755,root,root) %{_bindir}/ncdump
%attr(755,root,root) %{_bindir}/ncgen
@@ -260,105 +125,29 @@
%files devel
%defattr(644,root,root,755)
-%doc man4/netcdf-c.html
+%doc man4/html/*
%attr(755,root,root) %{_bindir}/nc-config
%attr(755,root,root) %{_libdir}/libnetcdf.so
%{_libdir}/libnetcdf.la
%{_includedir}/netcdf.h
%{_pkgconfigdir}/netcdf.pc
%{_mandir}/man3/netcdf.3*
-%{_infodir}/netcdf.info*
-%{_infodir}/netcdf-c.info*
-%{_infodir}/netcdf-install.info*
-%{_infodir}/netcdf-tutorial.info*
%files static
%defattr(644,root,root,755)
%{_libdir}/libnetcdf.a
-%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) %{_libdir}/libnetcdf_c++4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnetcdf_c++4.so.1
-
-%files c++-devel
-%defattr(644,root,root,755)
-%doc man4/netcdf-cxx.html
-%attr(755,root,root) %{_libdir}/libnetcdf_c++.so
-%attr(755,root,root) %{_libdir}/libnetcdf_c++4.so
-%{_libdir}/libnetcdf_c++.la
-%{_libdir}/libnetcdf_c++4.la
-# netcdf 3
-%{_includedir}/ncvalues.h
-%{_includedir}/netcdf.hh
-%{_includedir}/netcdfcpp.h
-# netcdf 4
-%{_includedir}/ncAtt.h
-%{_includedir}/ncByte.h
-%{_includedir}/ncChar.h
-%{_includedir}/ncCheck.h
-%{_includedir}/ncCompoundType.h
-%{_includedir}/ncDim.h
-%{_includedir}/ncDouble.h
-%{_includedir}/ncEnumType.h
-%{_includedir}/ncException.h
-%{_includedir}/ncFile.h
-%{_includedir}/ncFloat.h
-%{_includedir}/ncGroup.h
-%{_includedir}/ncGroupAtt.h
-%{_includedir}/ncInt.h
-%{_includedir}/ncInt64.h
-%{_includedir}/ncOpaqueType.h
-%{_includedir}/ncShort.h
-%{_includedir}/ncString.h
-%{_includedir}/ncType.h
-%{_includedir}/ncUbyte.h
-%{_includedir}/ncUint.h
-%{_includedir}/ncUint64.h
-%{_includedir}/ncUshort.h
-%{_includedir}/ncVar.h
-%{_includedir}/ncVarAtt.h
-%{_includedir}/ncVlenType.h
-%{_includedir}/netcdf
-%{_infodir}/netcdf-cxx.info*
-
-%files c++-static
-%defattr(644,root,root,755)
-%{_libdir}/libnetcdf_c++.a
-%{_libdir}/libnetcdf_c++4.a
-
-%files fortran
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnetcdff.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnetcdff.so.5
-
-%files fortran-devel
-%defattr(644,root,root,755)
-%doc man4/netcdf-f77.html man4/netcdf-f90.html
-%attr(755,root,root) %{_libdir}/libnetcdff.so
-%{_libdir}/libnetcdff.la
-%{_includedir}/netcdf.inc
-%{_mandir}/man3/netcdf_f77.3*
-%{_infodir}/netcdf-f77.info*
-%if %{with f90}
-%{_includedir}/netcdf.mod
-%{_includedir}/typesizes.mod
-%{_mandir}/man3/netcdf_f90.3*
-%{_infodir}/netcdf-f90.info*
-%endif
-
-%files fortran-static
-%defattr(644,root,root,755)
-%{_libdir}/libnetcdff.a
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2012/03/20 19:54:11 qboosh
+- updated to 4.2
+- removed obsolete szip patch; info and f90 patches no longer applicable here
+- fortran and c++ bindings moved to separate packages
(netcdf-{fortran,cxx,cxx4}.spec)
+
Revision 1.39 2011/09/12 08:24:08 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org//packages/netcdf/netcdf.spec?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
