Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2012-11-21 17:00:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5", Maintainer is "pgaj...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2012-11-06 16:04:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hdf5.new/hdf5.changes 2012-11-21 17:01:02.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Nov 18 12:31:34 UTC 2012 - sweet_...@gmx.de + +- Update to 1.8.10, changes documented here: + http://www.hdfgroup.org/HDF5/doc/ADGuide/Changes.html +- remove hdf5-ph5diff.patch (fixed by upstream) +- add hdf5-fix_printf.patch + +------------------------------------------------------------------- +Fri Nov 16 16:23:18 UTC 2012 - sweet_...@gmx.de + +- cosmetics, enable parallel build for suse only +- fix build for old findutils + +------------------------------------------------------------------- Old: ---- hdf5-1.8.9-tests-arm.patch hdf5-1.8.9.tar.bz2 hdf5-ph5diff.patch New: ---- hdf5-1.8.10-tests-arm.patch hdf5-1.8.10.tar.bz2 hdf5-fix_printf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.DMnNb8/_old 2012-11-21 17:01:04.000000000 +0100 +++ /var/tmp/diff_new_pack.DMnNb8/_new 2012-11-21 17:01:04.000000000 +0100 @@ -20,13 +20,17 @@ %define libname libhdf5 %if 0%{?sles_version} -%define _mpi openmpi mvapich2 -%else -%define _mpi openmpi +%define _mvapich2 1 %endif +%if 0%{?suse_version} +%define _openmpi 1 +%endif + +%define _mpi %{?_openmpi:openmpi} %{?_mvapich2:mvapich2} + Name: hdf5 -Version: 1.8.9 +Version: 1.8.10 Release: 0 Summary: A general purpose library and file format for storing scientific data License: BSD-3-Clause @@ -35,10 +39,10 @@ Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2 Patch0: hdf5-LD_LIBRARY_PATH.patch Patch1: hdf5-non_void_return.patch -# Fix typo bug in parallel h5diff (fixed in 1.9.x) -Patch3: hdf5-ph5diff.patch +# fix broken printf call, sent upstream +Patch2: hdf5-fix_printf.patch %ifarch %arm -Patch4: hdf5-1.8.9-tests-arm.patch +Patch4: hdf5-1.8.10-tests-arm.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -51,8 +55,10 @@ %if 0%{?suse_version} >= 1110 BuildRequires: fdupes %endif +%if 0%{?_openmpi} BuildRequires: openmpi-devel -%if 0%{?sles_version} +%endif +%if 0%{?_mvapich2} BuildRequires: mvapich2-devel %endif @@ -129,6 +135,7 @@ Examples of HDF5 library use. +%if 0%{?_openmpi} %package -n %{name}-openmpi Summary: A general purpose library and file format for storing scientific data Group: Development/Libraries/Other @@ -195,9 +202,9 @@ scientific data. This package provides the static libraries. +%endif - -%if 0%{?sles_version} +%if 0%{?_mvapich2} %package -n %{name}-mvapich2 Summary: A general purpose library and file format for storing scientific data Group: Development/Libraries/Other @@ -270,11 +277,12 @@ %setup -q %patch0 -p1 -b .LD_LIBRARY_PATH %patch1 -p0 -b .non_void_return -%patch3 -p1 -b .ph5diff +%patch2 -p0 -b .fix_printf %ifarch %arm %patch4 -p0 -b .tests-arm %endif +echo "prepare parallel builds: %_mpi" for build_dir in build %_mpi; do mkdir $build_dir ln -s ../configure $build_dir @@ -337,7 +345,7 @@ make install DESTDIR="%buildroot" -C "$build_dir" done -find "%buildroot/%_libdir" -type f -name "*.la" -delete +find "%buildroot/%_libdir" -type f -name "*.la" | xargs rm -f find %{buildroot}%{_datadir}/hdf5_examples -type f \ | grep -v ".sh$" | xargs chmod 644 # delete examples from parallel builds @@ -375,6 +383,7 @@ %postun -n %{libname}_hl%{hdf5_libver} -p /sbin/ldconfig +%if 0%{?_openmpi} %post -n %{libname}-%{hdf5_libver}-openmpi -p /sbin/ldconfig %postun -n %{libname}-%{hdf5_libver}-openmpi -p /sbin/ldconfig @@ -382,8 +391,9 @@ %post -n %{libname}_hl%{hdf5_libver}-openmpi -p /sbin/ldconfig %postun -n %{libname}_hl%{hdf5_libver}-openmpi -p /sbin/ldconfig +%endif -%if 0%{?sles_version} +%if 0%{?_mvapich2} %post -n %{libname}-%{hdf5_libver}-mvapich2 -p /sbin/ldconfig %postun -n %{libname}-%{hdf5_libver}-mvapich2 -p /sbin/ldconfig @@ -454,6 +464,7 @@ %defattr(-,root,root) %{_datadir}/hdf5_examples +%if 0%{?_openmpi} %files -n %{name}-openmpi %defattr(-,root,root) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt @@ -508,8 +519,9 @@ %files openmpi-devel-static %defattr(-,root,root) %{_libdir}/mpi/gcc/openmpi/%_lib/*.a +%endif -%if 0%{?sles_version} +%if 0%{?_mvapich2} %files -n %{name}-mvapich2 %defattr(-,root,root) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt ++++++ hdf5-1.8.9-tests-arm.patch -> hdf5-1.8.10-tests-arm.patch ++++++ --- /work/SRC/openSUSE:Factory/hdf5/hdf5-1.8.9-tests-arm.patch 2012-06-26 15:52:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hdf5.new/hdf5-1.8.10-tests-arm.patch 2012-11-21 17:01:02.000000000 +0100 @@ -8,40 +8,3 @@ AddTest("time", test_time, cleanup_time, "Time Datatypes", NULL); AddTest("reference", test_reference, cleanup_reference, "References", NULL); AddTest("vltypes", test_vltypes, cleanup_vltypes, "Variable-Length Datatypes", NULL); ---- ./test/big.c.orig 2012-05-09 17:05:49.000000000 +0200 -+++ ./test/big.c 2012-06-22 11:26:13.954168044 +0200 -@@ -793,7 +793,7 @@ main (int ac, char **av) - if (testvfd(SEC2_VFD) != 0) - goto error; - if (testvfd(STDIO_VFD) != 0) -- goto error; -+ HDfprintf(stderr, "Test for stdio fails on arm as expected.\n"); - - /* End with normal exit code */ - return 0; ---- test/Makefile.am.orig 2012-05-09 17:05:49.000000000 +0200 -+++ test/Makefile.am 2012-06-22 11:27:02.944607103 +0200 -@@ -41,8 +41,8 @@ TEST_PROG=testhdf5 lheap ohdr stab gheap - dtypes dsets cmpd_dset filter_fail extend external efc objcopy links unlink \ - big mtime fillval mount flush1 flush2 app_ref enum \ - set_extent ttsafe \ -- getname vfd ntypes dangle dtransform reserved cross_read \ -- freespace mf btree2 fheap file_image -+ getname ntypes dangle dtransform reserved cross_read \ -+ freespace mf btree2 fheap - - # List programs to be built when testing here. error_test and err_compat are - # built at the same time as the other tests, but executed by testerror.sh. ---- test/Makefile.in.orig 2012-05-09 17:07:36.000000000 +0200 -+++ test/Makefile.in 2012-06-22 11:26:54.270883504 +0200 -@@ -769,8 +769,8 @@ TEST_PROG = testhdf5 lheap ohdr stab ghe - dtypes dsets cmpd_dset filter_fail extend external efc objcopy links unlink \ - big mtime fillval mount flush1 flush2 app_ref enum \ - set_extent ttsafe \ -- getname vfd ntypes dangle dtransform reserved cross_read \ -- freespace mf btree2 fheap file_image -+ getname ntypes dangle dtransform reserved cross_read \ -+ freespace mf btree2 fheap - - - # These programs generate test files for the tests. They don't need to be ++++++ hdf5-1.8.9.tar.bz2 -> hdf5-1.8.10.tar.bz2 ++++++ ++++ 106194 lines of diff (skipped) ++++++ hdf5-LD_LIBRARY_PATH.patch ++++++ --- /var/tmp/diff_new_pack.DMnNb8/_old 2012-11-21 17:01:07.000000000 +0100 +++ /var/tmp/diff_new_pack.DMnNb8/_new 2012-11-21 17:01:07.000000000 +0100 @@ -1,19 +1,18 @@ -diff -up hdf5-1.8.8/configure.LD_LIBRARY_PATH hdf5-1.8.8/configure ---- hdf5-1.8.8/configure.LD_LIBRARY_PATH 2011-11-16 11:21:54.511269486 -0700 -+++ hdf5-1.8.8/configure 2011-11-16 11:28:18.673392600 -0700 -@@ -26746,8 +26746,6 @@ $as_echo_n "checking how to print long l - if ${hdf5_cv_printf_ll+:} false; then : +--- hdf5-1.8.10/configure.orig 2012-10-27 02:14:59.000000000 +0200 ++++ hdf5-1.8.10/configure 2012-11-18 14:17:44.572966644 +0100 +@@ -27496,9 +27496,6 @@ if ${hdf5_cv_printf_ll+:} false; then : $as_echo_n "(cached) " >&6 else -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`" --export LD_LIBRARY_PATH +-LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`" +-export LD_LIBRARY_PATH +- for hdf5_cv_printf_ll in l ll L q unknown; do if test "$cross_compiling" = yes; then : -diff -up hdf5-1.8.8/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.8/src/Makefile.in ---- hdf5-1.8.8/src/Makefile.in.LD_LIBRARY_PATH 2011-11-15 08:13:54.000000000 -0700 -+++ hdf5-1.8.8/src/Makefile.in 2011-11-16 11:43:42.938914069 -0700 -@@ -1267,8 +1267,6 @@ help: + continue +--- hdf5-1.8.10/src/Makefile.in.orig 2012-10-27 02:14:55.000000000 +0200 ++++ hdf5-1.8.10/src/Makefile.in 2012-11-17 11:11:17.755746326 +0100 +@@ -1327,8 +1327,6 @@ help: # Remove the generated .c file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. H5Tinit.c: H5detect$(EXEEXT) @@ -22,7 +21,7 @@ $(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ ($(RM) $@ ; exit 1) -@@ -1279,8 +1277,6 @@ H5Tinit.c: H5detect$(EXEEXT) +@@ -1339,8 +1337,6 @@ H5Tinit.c: H5detect$(EXEEXT) # Remove the generated .c file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings ++++++ hdf5-fix_printf.patch ++++++ --- test/testhdf5.h.orig 2012-10-11 19:30:43.000000000 +0200 +++ test/testhdf5.h 2012-11-19 12:34:25.021980147 +0100 @@ -142,7 +142,7 @@ if(VERBOSE_HI) \ print_func(" Call to routine: %15s at line %4d in %s returned " \ "invalid result\n", where, (int)__LINE__, __FILE__); \ - TestErrPrintf("*** UNEXPECTED RESULT from %s at line %4d in %s\n" \ + TestErrPrintf("*** UNEXPECTED RESULT from %s at line %4d in %s\n", \ where, (int)__LINE__, __FILE__); \ } while(0) ++++++ hdf5-non_void_return.patch ++++++ --- /var/tmp/diff_new_pack.DMnNb8/_old 2012-11-21 17:01:07.000000000 +0100 +++ /var/tmp/diff_new_pack.DMnNb8/_new 2012-11-21 17:01:07.000000000 +0100 @@ -1,15 +1,3 @@ -Index: hl/src/H5LTanalyze.l -=================================================================== ---- hl/src/H5LTanalyze.l.orig 2011-11-27 14:19:17.000000000 +0100 -+++ hl/src/H5LTanalyze.l 2011-11-27 14:20:12.619164660 +0100 -@@ -184,6 +184,7 @@ int my_yyinput(char *buf, int max_size) - int H5LTyyerror(char *msg) - { - printf("ERROR: %s before \"%s\".\n", msg, yytext); -+ return (0); // return from non void fix - } - - int yywrap() Index: test/dt_arith.c =================================================================== --- test/dt_arith.c.orig 2011-11-27 14:22:13.000000000 +0100 @@ -34,20 +22,6 @@ } -Index: hl/src/H5LTanalyze.c -=================================================================== ---- hl/src/H5LTanalyze.c.orig 2011-11-07 23:11:38.000000000 +0100 -+++ hl/src/H5LTanalyze.c 2011-11-27 21:59:27.188216404 +0100 -@@ -2332,6 +2332,9 @@ int my_yyinput(char *buf, int max_size) - int H5LTyyerror(char *msg) - { - printf("ERROR: %s before \"%s\".\n", msg, yytext); -+ return (0); // return from non void fix. Fix is already applied at lexer -+ // file but i will not re-generate this file as it looks it is changed -+ // by hand ... - } - - int yywrap() --- test/filter_fail.c.orig 2012-05-09 17:05:49.000000000 +0200 +++ test/filter_fail.c 2012-06-22 09:03:42.885161176 +0200 @@ -408,4 +408,5 @@ error: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
