[hdf5] Update to 1.8.13
Orion Poplawski
orion at fedoraproject.org
Thu May 15 16:48:47 UTC 2014
commit e2aac18e724967f2703e16f6fcf6ff7f32d2d6f2
Author: Orion Poplawski <orion at nwra.com>
Date: Thu May 15 10:48:39 2014 -0600
Update to 1.8.13
.gitignore | 2 +
hdf5-LD_LIBRARY_PATH.patch | 72 +++++++++++++++++++++++++++++++++-----------
hdf5.spec | 9 ++++--
sources | 5 +--
4 files changed, 64 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ccbbe10..0265d59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ hdf5-1.8.5.tar.bz2
/hdf5-1.8.12.tar.bz2
/hdf5_1.8.12-1.debian.tar.gz
/hdf5_1.8.12-4.debian.tar.gz
+/hdf5-1.8.13.tar.bz2
+/hdf5_1.8.12+docs-1.1.debian.tar.xz
diff --git a/hdf5-LD_LIBRARY_PATH.patch b/hdf5-LD_LIBRARY_PATH.patch
index f34ea69..3a9b366 100644
--- a/hdf5-LD_LIBRARY_PATH.patch
+++ b/hdf5-LD_LIBRARY_PATH.patch
@@ -1,20 +1,7 @@
-diff -up hdf5-1.8.10/configure.LD_LIBRARY_PATH hdf5-1.8.10/configure
---- hdf5-1.8.10/configure.LD_LIBRARY_PATH 2012-10-26 18:14:59.000000000 -0600
-+++ hdf5-1.8.10/configure 2012-11-14 08:56:52.695024834 -0700
-@@ -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
--
- for hdf5_cv_printf_ll in l ll L q unknown; do
- if test "$cross_compiling" = yes; then :
- continue
-diff -up hdf5-1.8.10/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.10/src/Makefile.in
---- hdf5-1.8.10/src/Makefile.in.LD_LIBRARY_PATH 2012-10-26 18:14:55.000000000 -0600
-+++ hdf5-1.8.10/src/Makefile.in 2012-11-14 08:55:35.197476914 -0700
-@@ -1327,8 +1327,6 @@ help:
+diff -up hdf5-1.8.13/src/Makefile.am.LD_LIBRARY_PATH hdf5-1.8.13/src/Makefile.am
+--- hdf5-1.8.13/src/Makefile.am.LD_LIBRARY_PATH 2014-05-05 20:13:01.000000000 -0600
++++ hdf5-1.8.13/src/Makefile.am 2014-05-15 09:53:59.569476295 -0600
+@@ -128,8 +128,6 @@ settings_DATA=libhdf5.settings
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
# is set to ignore the error.
H5Tinit.c: H5detect$(EXEEXT)
@@ -23,7 +10,7 @@ diff -up hdf5-1.8.10/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.10/src/Makefile.in
$(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
($(RM) $@ ; exit 1)
-@@ -1339,8 +1337,6 @@ H5Tinit.c: H5detect$(EXEEXT)
+@@ -140,8 +138,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
@@ -32,3 +19,52 @@ diff -up hdf5-1.8.10/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.10/src/Makefile.in
$(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@ || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
($(RM) $@ ; exit 1)
+diff -up hdf5-1.8.13/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.13/src/Makefile.in
+--- hdf5-1.8.13/src/Makefile.in.LD_LIBRARY_PATH 2014-05-05 20:15:48.000000000 -0600
++++ hdf5-1.8.13/src/Makefile.in 2014-05-15 09:44:15.622418784 -0600
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.14.1 from Makefile.am.
++# Makefile.in generated by automake 1.13.4 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+@@ -109,7 +109,10 @@ noinst_PROGRAMS = H5detect$(EXEEXT) H5ma
+ TESTS =
+ subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++ $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+@@ -883,8 +886,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+ $(am__aclocal_m4_deps):
+
+ H5config.h: stamp-h1
+- @test -f $@ || rm -f stamp-h1
+- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
++ @if test ! -f $@; then rm -f stamp-h1; else :; fi
++ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+
+ stamp-h1: $(srcdir)/H5config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+@@ -1207,14 +1210,14 @@ distclean-compile:
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/hdf5.spec b/hdf5.spec
index b9bbbe6..879be36 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -6,8 +6,8 @@
# NOTE: Try not to release new versions to released versions of Fedora
# You need to recompile all users of HDF5 for each version change
Name: hdf5
-Version: 1.8.12
-Release: 6%{?dist}
+Version: 1.8.13
+Release: 1%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD
Group: System Environment/Libraries
@@ -16,7 +16,7 @@ URL: http://www.hdfgroup.org/HDF5/
Source0: http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%{version}%{?snaprel}/src/hdf5-%{version}%{?snaprel}.tar.bz2
Source1: h5comp
# For man pages
-Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_%{version}-4.debian.tar.gz
+Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.8.12+docs-1.1.debian.tar.xz
Patch0: hdf5-LD_LIBRARY_PATH.patch
Patch1: hdf5-1.8.8-tstlite.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=925545
@@ -416,6 +416,9 @@ done
%changelog
+* Thu May 15 2014 Orion Poplawski <orion at cora.nwra.com> - 1.8.13-1
+- Update to 1.8.13
+
* Mon Mar 24 2014 Orion Poplawski <orion at cora.nwra.com> - 1.8.12-6
- Add patch to add ppc64le to config.guess (bug #1080122)
diff --git a/sources b/sources
index c32b61f..60863bc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-03ad766d225f5e872eb3e5ce95524a08 hdf5-1.8.12.tar.bz2
-28adeabb6b0179e62d82110450935487 hdf5_1.8.12-1.debian.tar.gz
-918828a109a7c4ee0639a7515fcfb1e0 hdf5_1.8.12-4.debian.tar.gz
+b060bb137d6bd8accf8f0c4c59d2746d hdf5-1.8.13.tar.bz2
+facc4720a0513a6f8465dd046786fab1 hdf5_1.8.12+docs-1.1.debian.tar.xz
More information about the scm-commits
mailing list