Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2017-09-21 12:29:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5" Thu Sep 21 12:29:38 2017 rev:34 rq:519640 version:1.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2016-10-10 17:27:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hdf5.new/hdf5.changes 2017-09-21 12:29:39.459064476 +0200 @@ -1,0 +2,18 @@ +Tue Aug 29 12:03:27 UTC 2017 - [email protected] + +- fix compiler flag substitution + +------------------------------------------------------------------- +Mon Jul 3 12:53:05 UTC 2017 - [email protected] + +- Add libsz2-devel to list of Requires for -devel packages, this + is required for compilation against hdf5 when szlib support is + enabled. +- Minor specfile cleanups using spec-cleaner. + +------------------------------------------------------------------- +Fri Jun 16 21:13:30 UTC 2017 - [email protected] + +- Enabled szlib support through libaec's szlib API + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.QPxFLf/_old 2017-09-21 12:29:40.766880509 +0200 +++ /var/tmp/diff_new_pack.QPxFLf/_new 2017-09-21 12:29:40.770879947 +0200 @@ -1,7 +1,7 @@ # # spec file for package hdf5 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,6 @@ %endif %define _mpi %{?_openmpi:openmpi} %{?_mvapich2:mvapich2} - # TODO: The so numbers autodetected by update_so_version.sh # do not match the so numbers that are actually buit. %define sonum 100 @@ -59,11 +58,11 @@ Patch6: hdf5-buildcompare.patch Patch7: hdf5-mpi.patch Patch8: hdf5_disable_testphdf5.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: krb5-devel +BuildRequires: libsz2-devel BuildRequires: openssl-devel BuildRequires: zlib-devel %if 0%{?_openmpi} @@ -78,6 +77,7 @@ Requires: libhdf5_hl%{sonum_HL} = %{version} Requires: libhdf5_hl_cpp%{sonum_HL_CXX} = %{version} Requires: libhdf5hl_fortran%{sonum_HL_F} = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description HDF5 is a data model, library, and file format for storing and @@ -159,8 +159,8 @@ %package -n libhdf5-%{sonum} Summary: Shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5 = %{version} Obsoletes: libhdf5 < %{version} @@ -186,8 +186,8 @@ %package -n libhdf5-%{sonum}-openmpi Summary: Shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5-openmpi = %{version} Obsoletes: libhdf5-openmpi < %{version} @@ -213,8 +213,8 @@ %package -n libhdf5-%{sonum}-mvapich2 Summary: Shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5-mvapich2 = %{version} Obsoletes: libhdf5-mvapich2 < %{version} @@ -240,8 +240,8 @@ %package -n libhdf5_hl%{sonum_HL} Summary: High-level shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5_hl = %{version} Obsoletes: libhdf5_hl < %{version} @@ -267,8 +267,8 @@ %package -n libhdf5_hl%{sonum_HL}-openmpi Summary: High-level shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5_hl-openmpi = %{version} Obsoletes: libhdf5_hl-openmpi < %{version} @@ -295,8 +295,8 @@ %package -n libhdf5_hl%{sonum_HL}-mvapich2 Summary: High-level shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5_hl-mvapich2 = %{version} Obsoletes: libhdf5_hl-mvapich2 < %{version} @@ -323,8 +323,8 @@ %package -n libhdf5_cpp%{sonum_CXX} Summary: Shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5_cpp = %{version} Obsoletes: libhdf5_cpp < %{version} @@ -350,8 +350,8 @@ %package -n libhdf5_hl_cpp%{sonum_HL_CXX} Summary: High-level shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5_hl_cpp = %{version} Obsoletes: libhdf5_hl_cpp < %{version} @@ -377,8 +377,8 @@ %package -n libhdf5_fortran%{sonum_F} Summary: Shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5_fortran = %{version} Obsoletes: libhdf5_fortran < %{version} @@ -404,8 +404,8 @@ %package -n libhdf5_fortran%{sonum_F}-openmpi Summary: Shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5_fortran-openmpi = %{version} Obsoletes: libhdf5_fortran-openmpi < %{version} @@ -431,8 +431,8 @@ %package -n libhdf5_fortran%{sonum_F}-mvapich2 Summary: Shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5_fortran-mvapich2 = %{version} Obsoletes: libhdf5_fortran-mvapich2 < %{version} @@ -458,8 +458,8 @@ %package -n libhdf5hl_fortran%{sonum_HL_F} Summary: High-level shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5hl_fortran = %{version} Obsoletes: libhdf5hl_fortran < %{version} @@ -485,8 +485,8 @@ %package -n libhdf5hl_fortran%{sonum_HL_F}-openmpi Summary: High-level shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5hl_fortran-openmpi = %{version} Obsoletes: libhdf5hl_fortran-openmpi < %{version} @@ -513,8 +513,8 @@ %package -n libhdf5hl_fortran%{sonum_HL_F}-mvapich2 Summary: High-level shared libraries for the HDF5 scientific data format -Group: Productivity/Scientific/Other # To avoid unresolvable errors due to multiple providers of the library +Group: Productivity/Scientific/Other Provides: libhdf5hl_fortran-mvapich2 = %{version} Obsoletes: libhdf5hl_fortran-mvapich2 < %{version} @@ -569,6 +569,7 @@ Group: Development/Libraries/Other Requires: %{name} = %{version} Requires: %{name}-devel-data = %{version} +Requires: libsz2-devel # Required by Fortran programs? Requires: libhdf5-%{sonum} = %{version} Requires: libhdf5_cpp%{sonum_CXX} = %{version} @@ -603,6 +604,7 @@ Group: Development/Libraries/Parallel Requires: %{name}-devel-data = %{version} Requires: %{name}-openmpi = %{version} +Requires: libsz2-devel # Required by Fortran programs? Requires: libhdf5-%{sonum}-openmpi = %{version} Requires: libhdf5_fortran%{sonum_F}-openmpi = %{version} @@ -635,6 +637,7 @@ Group: Development/Libraries/Parallel Requires: %{name}-devel-data = %{version} Requires: %{name}-mvapich2 = %{version} +Requires: libsz2-devel # Required by Fortran programs? Requires: libhdf5-%{sonum}-mvapich2 = %{version} Requires: libhdf5_fortran%{sonum_F}-mvapich2 = %{version} @@ -768,7 +771,7 @@ This package provides examples of HDF5 library use. %prep -%setup -q -n %name-%version-patch1 +%setup -q -n %{name}-%{version}-patch1 %patch0 -p1 -b .LD_LIBRARY_PATH %patch1 -p0 -b .non_void_return %patch2 -p0 -b .abort_unknown_host_config @@ -780,8 +783,8 @@ %patch7 -p1 %patch8 -p1 -echo "prepare parallel builds: %_mpi" -for build_dir in build %_mpi; do +echo "prepare parallel builds: %{_mpi}" +for build_dir in build %{_mpi}; do mkdir $build_dir ln -s ../configure $build_dir done @@ -790,9 +793,10 @@ export CC=gcc export CXX=g++ export F9X=gfortran +export CFLAGS="%{optflags}" # workaround for known gcc issue, see RELEASE.txt if gcc --version |grep -q " 4\.[68]"; then - export CFLAGS="${RPM_OPT_FLAGS/-O2/-O0}" + export CFLAGS="${CFLAGS/-O2/-O0}" fi %ifarch %arm # we want to have useful H5_CFLAGS on arm too @@ -821,24 +825,25 @@ --enable-cxx \ --enable-threadsafe \ --enable-build-mode=production \ + --with-szlib \ --with-pthread make V=1 %{?_smp_mflags} popd -for mpi in %_mpi; +for mpi in %{_mpi}; do pushd $mpi export CC="%{_libdir}/mpi/gcc/$mpi/bin/mpicc" export FC="%{_libdir}/mpi/gcc/$mpi/bin/mpif90" export F77="%{_libdir}/mpi/gcc/$mpi/bin/mpif77" -export LD_LIBRARY_PATH="%{_libdir}/mpi/gcc/$mpi/%_lib" +export LD_LIBRARY_PATH="%{_libdir}/mpi/gcc/$mpi/%{_lib}" %configure \ --docdir=%{_docdir}/%{name} \ --prefix=%{_libdir}/mpi/gcc/$mpi \ --exec-prefix=%{_libdir}/mpi/gcc/$mpi \ --bindir=%{_libdir}/mpi/gcc/$mpi/bin \ - --libdir=%{_libdir}/mpi/gcc/$mpi/%_lib \ + --libdir=%{_libdir}/mpi/gcc/$mpi/%{_lib} \ --datadir=%{_libdir}/mpi/gcc/$mpi/share \ --includedir=%{_libdir}/mpi/gcc/$mpi/include \ --disable-dependency-tracking \ @@ -859,11 +864,11 @@ %install # install serial and parallel builds, (the serial one will win in case of # duplicate files) -for build_dir in %_mpi build; do - make install DESTDIR="%buildroot" -C "$build_dir" +for build_dir in %{_mpi} build; do + make install DESTDIR=%{buildroot} -C "$build_dir" done -find "%buildroot/%{_libdir}" -type f -name "*.la" | xargs rm -f +find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot}%{_datadir}/hdf5_examples -type f \ | grep -v ".sh$" | xargs chmod 644 # delete examples from parallel builds @@ -887,40 +892,32 @@ # default timeout is 1200 seconds export HDF5_ALARM_SECONDS=3600 %endif -make -C build check +make %{?_smp_mflags} -C build check export HDF5_Make_Ignore=yes -for mpi in %_mpi; do +for mpi in %{_mpi}; do make -C $mpi check done %post -n libhdf5-%{sonum} -p /sbin/ldconfig %postun -n libhdf5-%{sonum} -p /sbin/ldconfig - %post -n libhdf5_hl%{sonum_HL} -p /sbin/ldconfig %postun -n libhdf5_hl%{sonum_HL} -p /sbin/ldconfig - %post -n libhdf5_cpp%{sonum_CXX} -p /sbin/ldconfig %postun -n libhdf5_cpp%{sonum_CXX} -p /sbin/ldconfig - %post -n libhdf5_hl_cpp%{sonum_HL_CXX} -p /sbin/ldconfig %postun -n libhdf5_hl_cpp%{sonum_HL_CXX} -p /sbin/ldconfig - %post -n libhdf5_fortran%{sonum_F} -p /sbin/ldconfig %postun -n libhdf5_fortran%{sonum_F} -p /sbin/ldconfig - %post -n libhdf5hl_fortran%{sonum_HL_F} -p /sbin/ldconfig %postun -n libhdf5hl_fortran%{sonum_HL_F} -p /sbin/ldconfig %if 0%{?_openmpi} %post -n libhdf5-%{sonum}-openmpi -p /sbin/ldconfig %postun -n libhdf5-%{sonum}-openmpi -p /sbin/ldconfig - %post -n libhdf5_hl%{sonum_HL}-openmpi -p /sbin/ldconfig %postun -n libhdf5_hl%{sonum_HL}-openmpi -p /sbin/ldconfig - %post -n libhdf5_fortran%{sonum_F}-openmpi -p /sbin/ldconfig %postun -n libhdf5_fortran%{sonum_F}-openmpi -p /sbin/ldconfig - %post -n libhdf5hl_fortran%{sonum_HL_F}-openmpi -p /sbin/ldconfig %postun -n libhdf5hl_fortran%{sonum_HL_F}-openmpi -p /sbin/ldconfig %endif @@ -928,13 +925,10 @@ %if 0%{?_mvapich2} %post -n libhdf5-%{sonum}-mvapich2 -p /sbin/ldconfig %postun -n libhdf5-%{sonum}-mvapich2 -p /sbin/ldconfig - %post -n libhdf5_hl%{sonum_HL}-mvapich2 -p /sbin/ldconfig %postun -n libhdf5_hl%{sonum_HL}-mvapich2 -p /sbin/ldconfig - %post -n libhdf5_fortran%{sonum_F}-mvapich2 -p /sbin/ldconfig %postun -n libhdf5_fortran%{sonum_F}-mvapich2 -p /sbin/ldconfig - %post -n libhdf5hl_fortran%{sonum_HL_F}-mvapich2 -p /sbin/ldconfig %postun -n libhdf5hl_fortran%{sonum_HL_F}-mvapich2 -p /sbin/ldconfig %endif
