From 7a73d4b9eff44ed3c684017af2203d3153cb627f Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Wed, 10 Sep 2025 14:52:55 +0800
Subject: [PATCH] Upgrade version to 4.3.1

---
 hdf-build.patch                    | 64 ++++++++++++++++--------------
 hdf.spec                           | 17 ++++----
 hdf4.3.0.tar.gz => hdf4.3.1.tar.gz |  4 +-
 3 files changed, 46 insertions(+), 39 deletions(-)
 rename hdf4.3.0.tar.gz => hdf4.3.1.tar.gz (32%)

diff --git a/hdf-build.patch b/hdf-build.patch
index 6531214..b8e0825 100644
--- a/hdf-build.patch
+++ b/hdf-build.patch
@@ -1,7 +1,23 @@
-diff -up hdf4-master/java/src/jni/Makefile.am.build hdf4-master/java/src/jni/Makefile.am
---- hdf4-master/java/src/jni/Makefile.am.build	2024-02-06 22:11:46.219972170 -0700
-+++ hdf4-master/java/src/jni/Makefile.am	2024-02-06 22:12:33.262288868 -0700
-@@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src
+diff --git a/java/src/Makefile.am b/java/src/Makefile.am
+index 1412fdd..09a4476 100644
+--- a/java/src/Makefile.am
++++ b/java/src/Makefile.am
+@@ -13,8 +13,8 @@ JAVAROOT = .classes
+ classes:
+ 	test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
+ 
+-jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
+-hdf_javadir = $(libdir)
++jarfile = $(PACKAGE_TARNAME).jar
++hdf_javadir = $(prefix)/lib/java
+ 
+ pkgpath = hdf/hdflib
+ CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-2.0.16.jar:$$CLASSPATH
+diff --git a/java/src/jni/Makefile.am b/java/src/jni/Makefile.am
+index a893fdf..724ee09 100644
+--- a/java/src/jni/Makefile.am
++++ b/java/src/jni/Makefile.am
+@@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src        \
            $(JNIFLAGS)
  
  # This is our main target
@@ -13,23 +29,23 @@ diff -up hdf4-master/java/src/jni/Makefile.am.build hdf4-master/java/src/jni/Mak
  
  # Source files for the library
  libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \
-diff -up hdf4-master/java/src/Makefile.am.build hdf4-master/java/src/Makefile.am
---- hdf4-master/java/src/Makefile.am.build	2024-02-06 17:40:20.000000000 -0700
-+++ hdf4-master/java/src/Makefile.am	2024-02-06 22:11:46.219972170 -0700
-@@ -13,8 +13,8 @@ JAVAROOT = .classes
- classes:
+diff --git a/java/test/Makefile.am b/java/test/Makefile.am
+index c643526..0c2ed30 100644
+--- a/java/test/Makefile.am
++++ b/java/test/Makefile.am
+@@ -12,7 +12,7 @@ classes:
  	test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
  
--jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
--hdf_javadir = $(libdir)
-+jarfile = $(PACKAGE_TARNAME).jar
-+hdf_javadir = $(prefix)/lib/java
+ pkgpath = test
+-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
++hdfjarfile = $(PACKAGE_TARNAME).jar
+ CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/org.junit.jar:$(top_srcdir)/java/lib/org.hamcrest.jar:$(top_srcdir)/java/lib/slf4j-api-2.0.16.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-2.0.16.jar:$$CLASSPATH
  
- pkgpath = hdf/hdflib
- CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH
-diff -up hdf4-master/java/test/junit.sh.in.build hdf4-master/java/test/junit.sh.in
---- hdf4-master/java/test/junit.sh.in.build	2024-02-06 17:40:20.000000000 -0700
-+++ hdf4-master/java/test/junit.sh.in	2024-02-06 22:11:46.219972170 -0700
+ jarfile = jar$(PACKAGE_TARNAME)test.jar
+diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
+index 3e458e2..f7bb37e 100644
+--- a/java/test/junit.sh.in
++++ b/java/test/junit.sh.in
 @@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
  BLDLIBDIR="$top_builddir/hdf4/lib"
  BLDDIR="."
@@ -39,15 +55,3 @@ diff -up hdf4-master/java/test/junit.sh.in.build hdf4-master/java/test/junit.sh.
  TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
  test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
  
-diff -up hdf4-master/java/test/Makefile.am.build hdf4-master/java/test/Makefile.am
---- hdf4-master/java/test/Makefile.am.build	2024-02-06 17:40:20.000000000 -0700
-+++ hdf4-master/java/test/Makefile.am	2024-02-06 22:11:46.219972170 -0700
-@@ -12,7 +12,7 @@ classes:
- 	test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
- 
- pkgpath = test
--hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
-+hdfjarfile = $(PACKAGE_TARNAME).jar
- CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
- 
- jarfile = jar$(PACKAGE_TARNAME)test.jar
diff --git a/hdf.spec b/hdf.spec
index 2009db7..928fabe 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -1,6 +1,6 @@
 Name: hdf
-Version: 4.3.0
-Release: 2
+Version: 4.3.1
+Release: 1
 Summary: A general purpose library and file format for storing scientific data
 License: IJG
 URL: https://portal.hdfgroup.org/
@@ -54,13 +54,13 @@ HDF4 java library
 %autosetup -p1 -n hdf4-hdf%{version}
 
 find . -name "*.jar" -delete
-ln -s $(build-classpath hamcrest/core) java/lib/hamcrest-core.jar
-ln -s $(build-classpath junit) java/lib/junit.jar
+ln -s $(build-classpath hamcrest/core) java/lib/org.hamcrest.jar
+ln -s $(build-classpath junit) java/lib/org.junit.jar
 # Fix test output
 sed -i -e "s/JUnit version .*/JUnit version version (number)/" java/test/testfiles/JUnit-*.txt
-ln -s $(build-classpath slf4j/api) java/lib/slf4j-api-1.7.33.jar
-ln -s $(build-classpath slf4j/nop) java/lib/ext/slf4j-nop-1.7.33.jar
-ln -s $(build-classpath slf4j/simple) java/lib/ext/slf4j-simple-1.7.33.jar
+ln -s $(build-classpath slf4j/api) java/lib/slf4j-api-2.0.16.jar
+ln -s $(build-classpath slf4j/nop) java/lib/ext/slf4j-nop-2.0.16.jar
+ln -s $(build-classpath slf4j/simple) java/lib/ext/slf4j-simple-2.0.16.jar
 
 find . -type f -name "*.h" -exec chmod 0644 '{}' \;
 find . -type f -name "*.c" -exec chmod 0644 '{}' \;
@@ -156,6 +156,9 @@ make -j1 -C build-static check
 %{_libdir}/%{name}/libhdf_java.so
 
 %changelog
+* Wed Sep 10 2025 wangkai <13474090681@163.com> - 4.3.1-1
+- Upgrade version to 4.3.1
+
 * Mon Sep 08 2025 Funda Wang <fundawang@yeah.net> - 4.3.0-2
 - move *.so.* into main package
 
diff --git a/hdf4.3.0.tar.gz b/hdf4.3.1.tar.gz
similarity index 32%
rename from hdf4.3.0.tar.gz
rename to hdf4.3.1.tar.gz
index 9b229ed..0a4d4c1 100644
--- a/hdf4.3.0.tar.gz
+++ b/hdf4.3.1.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6639a556650e6ea8632a17b8188a69de844bdff54ce121a1fd5b92c8dd06cb1
-size 9045018
+oid sha256:6dc3b8af610526788bf78fb3982b25a80abfc94e37ce0c3ae2929b5e9c937093
+size 9328847
-- 
Gitee