From dc0df100d5cd8c7514e3a74033d8b2e0dc946cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 5 Jun 2015 22:24:20 +0200 Subject: [PATCH] - drop unnecessary patch, issue seems fixed with gcc5 --- hdf5-1.8.8-tstlite.patch | 24 ------------------------ hdf5.spec | 10 ++++------ 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 hdf5-1.8.8-tstlite.patch diff --git a/hdf5-1.8.8-tstlite.patch b/hdf5-1.8.8-tstlite.patch deleted file mode 100644 index 419662e..0000000 --- a/hdf5-1.8.8-tstlite.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up hdf5-1.8.8/hl/fortran/test/Makefile.am.tstlite hdf5-1.8.8/hl/fortran/test/Makefile.am ---- hdf5-1.8.8/hl/fortran/test/Makefile.am.tstlite 2011-12-21 17:27:14.000000000 +0100 -+++ hdf5-1.8.8/hl/fortran/test/Makefile.am 2011-12-21 17:27:29.000000000 +0100 -@@ -33,7 +33,7 @@ else - endif - - # Our main target, the test programs --TEST_PROG=tstds tstlite tstimage tsttable -+TEST_PROG=tstds tstimage tsttable - check_PROGRAMS=$(TEST_PROG) - - LDADD= $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5) -diff -up hdf5-1.8.8/hl/fortran/test/Makefile.in.tstlite hdf5-1.8.8/hl/fortran/test/Makefile.in ---- hdf5-1.8.8/hl/fortran/test/Makefile.in.tstlite 2011-12-21 17:27:21.000000000 +0100 -+++ hdf5-1.8.8/hl/fortran/test/Makefile.in 2011-12-21 17:27:37.000000000 +0100 -@@ -409,7 +409,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c - f1tab.h5 tstds.h5 - - # Our main target, the test programs --TEST_PROG = tstds tstlite tstimage tsttable -+TEST_PROG = tstds tstimage tsttable - LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5) - - # Source files for the programs diff --git a/hdf5.spec b/hdf5.spec index eaae62c..7671dee 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -7,7 +7,7 @@ # You need to recompile all users of HDF5 for each version change Name: hdf5 Version: 1.8.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -18,7 +18,6 @@ Source1: h5comp # For man pages Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.8.14+docs-3.debian.tar.xz Patch0: hdf5-LD_LIBRARY_PATH.patch -Patch1: hdf5-1.8.8-tstlite.patch # Fix -Werror=format-security errors Patch2: hdf5-format.patch # Fix long double conversions on ppc64le @@ -153,10 +152,6 @@ HDF5 parallel openmpi static libraries #setup -q -n %{name}-%{version}%{?snaprel} %setup -q -a 2 %patch0 -p1 -b .LD_LIBRARY_PATH -%ifarch ppc64 s390x -# the tstlite test fails with "stack smashing detected" on these arches -%patch1 -p1 -b .tstlite -%endif %patch2 -p1 -b .format %patch3 -p1 -b .ldouble-ppc64le #This should be fixed in 1.8.7 @@ -423,6 +418,9 @@ done %changelog +* Fri Jun 05 2015 Dan Horák - 1.8.15-2 +- drop unnecessary patch, issue seems fixed with gcc5 + * Sat May 16 2015 Orion Poplawski - 1.8.15-1 - Update to 1.8.15