netcdf: rebuild with hdf5-1.8.20

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11732 ec354946-7b23-47d6-9f5a-488ba84defc7

n/netcdf/netcdf-vl.spec

@@ -1,40 +1,49 @@
-Summary:	Libraries for the Unidata network Common Data Form
-Name:		netcdf
-Version:	4.3.2
-Release:	1%{?_dist_release}
+%define pkg_name    netcdf
+%define pkg_version 4.3.2
+%define pkg_release 2%{?_dist_release}
 
-License:	NetCDF
-Group:          System Environment/Libraries
-URL:		http://www.unidata.ucar.edu/downloads/netcdf/index.jsp
+Summary: Libraries for the Unidata network Common Data Form
+Name:    %{pkg_name}
+Version: %{pkg_version}
+Release: %{pkg_release}
+
+License: NetCDF
+Group:   System Environment/Libraries
+URL:     http://www.unidata.ucar.edu/downloads/netcdf/index.jsp
+
+Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-%{version}.tar.gz
 
-Source0:	ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-%{version}.tar.gz
 # Use pkgconfig in nc-config to avoid multi-lib issues
-Patch0:         netcdf-pkgconfig.patch
+Patch0: netcdf-pkgconfig.patch
 # Upstream patch to support hdf5 1.8.13 mpio change
-Patch1:         netcdf-mpio.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  chrpath
-BuildRequires:  curl-devel
-BuildRequires:  doxygen
-BuildRequires:  gawk
-BuildRequires:  hdf-devel
-BuildRequires:  hdf5-devel
-BuildRequires:  m4
-BuildRequires:  zlib-devel
-Requires:       hdf5
+Patch1: netcdf-mpio.patch
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: chrpath
+BuildRequires: curl-devel
+BuildRequires: doxygen
+BuildRequires: gawk
+BuildRequires: hdf-devel
+BuildRequires: hdf5-devel
+BuildRequires: m4
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: zlib-devel
+
+Requires: hdf5
+
 
 %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.
@@ -57,19 +66,18 @@ NetCDF data is:
 
 
 %package devel
-Summary:        Development files for netcdf
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:  Development files for netcdf
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
-This package contains the netCDF header files, libs, and man
-pages.
+This package contains the netCDF header files, libs, and man pages.
 
 
 %package static
-Summary:        Static libs for netcdf
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:  Static libs for netcdf
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description static
 This package contains the netCDF C static libs.
@@ -80,10 +88,9 @@ This package contains the netCDF C static libs.
 %patch0 -p1 -b .pkgconfig
 %patch1 -p1 -b .mpio
 
-
 %build
 export LDFLAGS="-L%{_libdir}/hdf"
-export CPPFLAGS=-I%{_includedir}/hdf 
+export CPPFLAGS=-I%{_includedir}/hdf
 export LIBS="-ldf -ljpeg"
 %configure \
     --enable-shared \
@@ -93,26 +100,26 @@ export LIBS="-ldf -ljpeg"
     --enable-hdf4 \
     --disable-dap-remote-tests
 
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
-chrpath --delete $RPM_BUILD_ROOT/%{_bindir}/nc{copy,dump,gen,gen3}
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+chrpath --delete ${RPM_BUILD_ROOT}%{_bindir}/nc{copy,dump,gen,gen3}
+%{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
+%{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 %check
-make check
+%{__make} check
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf ${RPM_BUILD_ROOT}
 
-%post -p /sbin/ldconfig
+%post -p %{_syssbindir}/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -p %{_syssbindir}/ldconfig
 
 
 %files
@@ -134,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 01 2018 Toshiaki Ara <ara_t@384.jp> 4.3.2-2
+- rebuild under hdf5-1.8.20
+
 * Sun Jan 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.3.2-1
 - updated to 4.3.2
 - built with hdf and hdf5