Update to 4.2.13

8 years ago · d734a5fec0
parent 60421e559c
commit d734a5fec0
5 changed files with 57 additions and 26 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,4 @@ hdf-4.2.5.tar.bz2
 /hdf-4.2.10.tar.bz2
 /hdf-4.2.11.tar.bz2
 /hdf-4.2.12.tar.bz2
+/hdf-4.2.13.tar.bz2
--- a/hdf-avoid_syntax_error_el6.patch
+++ b/hdf-avoid_syntax_error_el6.patch
@ -0,0 +1,17 @@
+--- configure.orig.ac	2017-06-24 23:00:04.000000000 +0200
+++ configure.ac	2017-07-21 22:13:19.695919835 +0200
+@@ -264,10 +264,10 @@
+       JNIFLAGS="$JNIFLAGS -I$JNI_INCLUDE_DIR"
+     done
+     ## Find junit for testing the JNI code
+-    AX_CHECK_CLASSPATH()
+-    CLASSPATH_ENV=$H4_CLASSPATH
+-    AX_CHECK_JUNIT()
+-    AX_CHECK_JAVA_HOME
+    ## AX_CHECK_CLASSPATH()
+    ## CLASSPATH_ENV=$H4_CLASSPATH
+    ## AX_CHECK_JUNIT()
+    ## AX_CHECK_JAVA_HOME
+ 
+     AC_MSG_RESULT([yes])
+   else
--- a/hdf-examplesdir.patch
+++ b/hdf-examplesdir.patch
@ -1,49 +1,49 @@
-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
+diff -up hdf/examples/Makefile.am hdf-4.2.12/hdf/examples/Makefile.am
+--- hdf/examples/Makefile.am	2017-01-31 14:41:51.947802481 -0700
+++ hdf/examples/Makefile.am	2017-01-31 14:42:34.883572782 -0700
+@@ -46,8 +46,8 @@
 INSTALL_TOP_FILES = README
 
 # Where to install example files
-EXAMPLEDIR=${DESTDIR}$(prefix)/examples/c
-EXAMPLETOPDIR=${DESTDIR}$(prefix)/examples
+-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/c
+-EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples
 +EXAMPLEDIR=$(docdir)/examples/c
 +EXAMPLETOPDIR=$(docdir)/examples
 
 # How to build C programs using h4cc
 $(EXTRA_PROG): $(H4CC)
-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
+diff -up hdf/fortran/examples/Makefile.am hdf/fortran/examples/Makefile.am
+--- hdf/fortran/examples/Makefile.am	2017-01-31 14:41:51.949802471 -0700
+++ hdf/fortran/examples/Makefile.am	2017-01-31 14:43:07.968395906 -0700
+@@ -41,7 +41,7 @@
 INSTALL_SCRIPT_FILES = run-fortran-ex.sh
 
 # Where to install Fortran example files
-EXAMPLEDIR=${DESTDIR}$(prefix)/examples/fortran
+-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/fortran
 +EXAMPLEDIR=$(docdir)/examples/fortran
 
 # How to build Fortran programs using h4fc
 $(EXTRA_PROG): $(H4FC)
-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
+diff -up mfhdf/examples/Makefile.am mfhdf/examples/Makefile.am
+--- mfhdf/examples/Makefile.am	2017-01-31 14:41:51.950802465 -0700
+++ mfhdf/examples/Makefile.am	2017-01-31 14:43:23.376314066 -0700
+@@ -23,7 +23,7 @@
 	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=${DESTDIR}$(prefix)/examples/c
+-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/c
 +EXAMPLEDIR=$(docdir)/examples/c
 
 # How to build programs using h4cc
 $(EXTRA_PROG): $(H4CC)
-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
+diff -up mfhdf/fortran/examples/Makefile.am mfhdf/fortran/examples/Makefile.am
+--- mfhdf/fortran/examples/Makefile.am	2017-01-31 14:41:51.952802455 -0700
+++ mfhdf/fortran/examples/Makefile.am	2017-01-31 14:43:40.206224672 -0700
+@@ -24,7 +24,7 @@
 	SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
 
 # Where to install example files
-EXAMPLEDIR=${DESTDIR}$(prefix)/examples/fortran
+-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/fortran
 +EXAMPLEDIR=$(docdir)/examples/fortran
 
 # How to build Fortran programs using h4fc
--- a/hdf.spec
+++ b/hdf.spec
@ -1,6 +1,6 @@
 Name: hdf
-Version: 4.2.12
-Release: 2%{?dist}
+Version: 4.2.13
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@ -21,6 +21,10 @@ Patch8: hdf-4.2.10-aarch64.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1134385
 Patch9: hdf-ppc64le.patch

+# Fix syntax error on epel6 builds
+# Use only if java is disabled
+Patch10: hdf-avoid_syntax_error_el6.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # For destdir/examplesdir patches
 BuildRequires: automake libtool
@ -61,10 +65,16 @@ HDF development headers and libraries.
 %patch3 -p1 -b .s390
 %patch4 -p1 -b .arm
 %patch5 -p1 -b .destdir
-%patch6 -p1 -b .examplesdir
+%patch6 -p0 -b .examplesdir
 %patch8 -p1 -b .aarch64
 %patch9 -p1 -b .ppc64le

+## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds
+# Use only if java is disabled
+%if 0%{?rhel} < 7
+%patch10 -p0
+%endif
+
 chmod a-x *hdf/*/*.c hdf/*/*.h
 # restore include file timestamps modified by patching
 touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h
@ -77,7 +87,7 @@ autoreconf -vif
 rm config/*linux-gnu
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export FFLAGS="$RPM_OPT_FLAGS -fPIC -ffixed-line-length-none"
-%configure --disable-production --disable-netcdf \
+%configure --disable-production --disable-java --disable-netcdf \
 --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name}

 make
@ -128,6 +138,9 @@ make check


 %changelog
+* Fri Jul 21 2017 Antonio Trande <sagitter@fedoraproject.org> 4.2.13-1
+- Update to 4.2.13
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (hdf-4.2.12.tar.bz2) = 507a85ce29f40e61bc096260d2089be2313a85d5ecd183171872a182df0284ccef0ac25a728114cbe8fe0bd07683a0c09f27b9a53c2712add2f29147df4d055f
+SHA512 (hdf-4.2.13.tar.bz2) = d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657