Accepting request 1203520 from Java:packages

Use SOURCE_DATE_EPOCH for reproducible jar mtime

OBS-URL: https://build.opensuse.org/request/show/1203520
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/native-platform?expand=0&rev=4

native-platform-Makefile

@@ -57,14 +57,14 @@ javafiles-list: $(_JAVA)
 
 javadoc: javafiles-list
 	mkdir -p $(JDOCDIR)
-	$(JAVA_HOME)/bin/javadoc -d $(JDOCDIR) -classpath $(JOPT_JAR) @javafiles-list
+	$(JAVA_HOME)/bin/javadoc -notimestamp -d $(JDOCDIR) -classpath $(JOPT_JAR) @javafiles-list
 
 jar: $(JCLASSESDIR)/%.class
 	mkdir -p $(JDOCDIR)
-	(cd $(JCLASSESDIR) ; $(JAVA_HOME)/bin/jar cf ../../$(JAR) .)
+	(cd $(JCLASSESDIR) ; $(JAVA_HOME)/bin/jar --create --file=../../$(JAR) .)
 
 arch-jar: $(ODIR)/libnative-platform.so $(ODIR)/libnative-platform-curses.so
-	(cd $(ODIR) ; $(JAVA_HOME)/bin/jar cf ../../$(JAR_ARCH) *.so)
+	(cd $(ODIR) ; $(JAVA_HOME)/bin/jar --create --file=../../$(JAR_ARCH) *.so)
 
 $(ODIR)/%.o: $(SRCDIR)/%.cpp $(IGEN)/native.h
 	mkdir -p $(ODIR)

native-platform.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep 25 08:38:32 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * reproducible-jar-mtime.patch
+    + Use SOURCE_DATE_EPOCH for reproducible jar mtime
+- Rename native-platform-0.7-Makefile to native-platform-Makefile
+  and modify to generate javadoc without hidden timestamps
+
 -------------------------------------------------------------------
 Wed Feb 21 21:33:50 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

native-platform.spec

@@ -24,14 +24,14 @@ Summary:        Java bindings for various native APIs
 License:        Apache-2.0
 URL:            https://github.com/adammurdoch/native-platform
 Source0:        https://github.com/adammurdoch/native-platform/archive/%{version}.tar.gz
-# From Debian
+Source4:        %{name}-Makefile
-Source4:        %{name}-0.7-Makefile
 # Try to load native library from /usr/lib*/native-platform
 # instead of extractDir or classpath.
 Patch0:         0001-Load-lib-from-system.patch
 # Use generate libraries without arch references
 # Add support for arm and other x64 arches
 Patch1:         0002-Use-library-name-without-arch.patch
+Patch2:         reproducible-jar-mtime.patch
 BuildRequires:  fdupes
 # build tools and deps
 BuildRequires:  gcc-c++
@@ -62,10 +62,13 @@ This package contains javadoc for %{name}.
 find .  -name "*.jar" -delete
 find .  -name "*.class" -delete
 
+cp -p %{SOURCE4} Makefile
+
 %patch -P 0 -p1
 %patch -P 1 -p1
-
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
-cp -p %{SOURCE4} Makefile
+%patch -P 2 -p1
+%endif
 
 chmod 644 readme.md
 sed -i 's/\r//' readme.md

reproducible-jar-mtime.patch

@@ -0,0 +1,15 @@
+--- native-platform-0.14/Makefile	2024-09-25 10:25:12.649998838 +0200
++++ native-platform-0.14/Makefile	2024-09-25 10:27:13.894145263 +0200
+@@ -61,10 +61,10 @@
+ 
+ jar: $(JCLASSESDIR)/%.class
+ 	mkdir -p $(JDOCDIR)
+-	(cd $(JCLASSESDIR) ; $(JAVA_HOME)/bin/jar --create --file=../../$(JAR) .)
++	(cd $(JCLASSESDIR) ; $(JAVA_HOME)/bin/jar --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=../../$(JAR) .)
+ 
+ arch-jar: $(ODIR)/libnative-platform.so $(ODIR)/libnative-platform-curses.so
+-	(cd $(ODIR) ; $(JAVA_HOME)/bin/jar --create --file=../../$(JAR_ARCH) *.so)
++	(cd $(ODIR) ; $(JAVA_HOME)/bin/jar --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=../../$(JAR_ARCH) *.so)
+ 
+ $(ODIR)/%.o: $(SRCDIR)/%.cpp $(IGEN)/native.h
+ 	mkdir -p $(ODIR)