From 2e6c8ec1ab13273c2cf84c4d6919cd8736d942e4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Jan 2017 15:36:17 -0700 Subject: [PATCH] Update to 4.2.12 --- .gitignore | 1 + hdf-examplesdir.patch | 34 +++++++++++++++++----------------- hdf.spec | 7 +++++-- sources | 2 +- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index ed85c01..3c7a093 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ hdf-4.2.5.tar.bz2 /hdf-4.2.9.tar.bz2 /hdf-4.2.10.tar.bz2 /hdf-4.2.11.tar.bz2 +/hdf-4.2.12.tar.bz2 diff --git a/hdf-examplesdir.patch b/hdf-examplesdir.patch index 6dddcc9..3d05880 100644 --- a/hdf-examplesdir.patch +++ b/hdf-examplesdir.patch @@ -1,49 +1,49 @@ -diff -up hdf-4.2.10/hdf/examples/Makefile.am.examplesdir hdf-4.2.10/hdf/examples/Makefile.am ---- hdf-4.2.10/hdf/examples/Makefile.am.examplesdir 2014-02-09 19:28:50.000000000 -0700 -+++ hdf-4.2.10/hdf/examples/Makefile.am 2014-02-14 10:10:17.854023687 -0700 +diff -up hdf-4.2.12/hdf/examples/Makefile.am.examplesdir hdf-4.2.12/hdf/examples/Makefile.am +--- hdf-4.2.12/hdf/examples/Makefile.am.examplesdir 2017-01-31 14:41:51.947802481 -0700 ++++ hdf-4.2.12/hdf/examples/Makefile.am 2017-01-31 14:42:34.883572782 -0700 @@ -46,8 +46,8 @@ INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh INSTALL_TOP_FILES = README # Where to install example files --EXAMPLEDIR=$(prefix)/examples/c --EXAMPLETOPDIR=$(prefix)/examples +-EXAMPLEDIR=${DESTDIR}$(prefix)/examples/c +-EXAMPLETOPDIR=${DESTDIR}$(prefix)/examples +EXAMPLEDIR=$(docdir)/examples/c +EXAMPLETOPDIR=$(docdir)/examples # How to build C programs using h4cc $(EXTRA_PROG): $(H4CC) -diff -up hdf-4.2.10/hdf/fortran/examples/Makefile.am.examplesdir hdf-4.2.10/hdf/fortran/examples/Makefile.am ---- hdf-4.2.10/hdf/fortran/examples/Makefile.am.examplesdir 2014-02-09 19:28:49.000000000 -0700 -+++ hdf-4.2.10/hdf/fortran/examples/Makefile.am 2014-02-14 10:10:30.082961395 -0700 +diff -up hdf-4.2.12/hdf/fortran/examples/Makefile.am.examplesdir hdf-4.2.12/hdf/fortran/examples/Makefile.am +--- hdf-4.2.12/hdf/fortran/examples/Makefile.am.examplesdir 2017-01-31 14:41:51.949802471 -0700 ++++ hdf-4.2.12/hdf/fortran/examples/Makefile.am 2017-01-31 14:43:07.968395906 -0700 @@ -41,7 +41,7 @@ INSTALL_FILES= VD_read_from_vdata.f VD_r INSTALL_SCRIPT_FILES = run-fortran-ex.sh # Where to install Fortran example files --EXAMPLEDIR=$(prefix)/examples/fortran +-EXAMPLEDIR=${DESTDIR}$(prefix)/examples/fortran +EXAMPLEDIR=$(docdir)/examples/fortran # How to build Fortran programs using h4fc $(EXTRA_PROG): $(H4FC) -diff -up hdf-4.2.10/mfhdf/examples/Makefile.am.examplesdir hdf-4.2.10/mfhdf/examples/Makefile.am ---- hdf-4.2.10/mfhdf/examples/Makefile.am.examplesdir 2014-02-09 19:28:45.000000000 -0700 -+++ hdf-4.2.10/mfhdf/examples/Makefile.am 2014-02-14 10:09:41.465209051 -0700 +diff -up hdf-4.2.12/mfhdf/examples/Makefile.am.examplesdir hdf-4.2.12/mfhdf/examples/Makefile.am +--- hdf-4.2.12/mfhdf/examples/Makefile.am.examplesdir 2017-01-31 14:41:51.950802465 -0700 ++++ hdf-4.2.12/mfhdf/examples/Makefile.am 2017-01-31 14:43:23.376314066 -0700 @@ -23,7 +23,7 @@ INSTALL_FILES = SD_create_sds.c SD_write SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c \ SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c --EXAMPLEDIR=$(prefix)/examples/c +-EXAMPLEDIR=${DESTDIR}$(prefix)/examples/c +EXAMPLEDIR=$(docdir)/examples/c # How to build programs using h4cc $(EXTRA_PROG): $(H4CC) -diff -up hdf-4.2.10/mfhdf/fortran/examples/Makefile.am.examplesdir hdf-4.2.10/mfhdf/fortran/examples/Makefile.am ---- hdf-4.2.10/mfhdf/fortran/examples/Makefile.am.examplesdir 2014-02-09 19:28:44.000000000 -0700 -+++ hdf-4.2.10/mfhdf/fortran/examples/Makefile.am 2014-02-14 10:09:52.818151212 -0700 +diff -up hdf-4.2.12/mfhdf/fortran/examples/Makefile.am.examplesdir hdf-4.2.12/mfhdf/fortran/examples/Makefile.am +--- hdf-4.2.12/mfhdf/fortran/examples/Makefile.am.examplesdir 2017-01-31 14:41:51.952802455 -0700 ++++ hdf-4.2.12/mfhdf/fortran/examples/Makefile.am 2017-01-31 14:43:40.206224672 -0700 @@ -24,7 +24,7 @@ INSTALL_FILES=SD_create_sds.f SD_write_t SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f # Where to install example files --EXAMPLEDIR=$(prefix)/examples/fortran +-EXAMPLEDIR=${DESTDIR}$(prefix)/examples/fortran +EXAMPLEDIR=$(docdir)/examples/fortran # How to build Fortran programs using h4fc diff --git a/hdf.spec b/hdf.spec index 63c0a2d..15b34ff 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,6 +1,6 @@ Name: hdf -Version: 4.2.11 -Release: 4%{?dist} +Version: 4.2.12 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -128,6 +128,9 @@ make check %changelog +* Tue Jan 31 2017 Orion Poplawski 4.2.12-1 +- Update to 4.2.12 + * Wed May 25 2016 Orion Poplawski 4.2.11-4 - Cleanup spec - Remove .la files diff --git a/sources b/sources index 8141c0d..b677ffe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -192a0320ef06f657523c2efaee0ccdcf hdf-4.2.11.tar.bz2 +SHA512 (hdf-4.2.12.tar.bz2) = 507a85ce29f40e61bc096260d2089be2313a85d5ecd183171872a182df0284ccef0ac25a728114cbe8fe0bd07683a0c09f27b9a53c2712add2f29147df4d055f