Accepting request 1203397 from Java:packages

Use SOURCE_DATE_EPOCH for reproducible jar mtime

OBS-URL: https://build.opensuse.org/request/show/1203397
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nanoxml?expand=0&rev=6

nanoxml-build.patch

@@ -54,7 +54,7 @@
  echo "Generating JavaDoc"
  mkdir "$CURRDIR/Documentation/JavaDoc"
 -javadoc -protected -sourcepath "$CURRDIR/Sources/Lite:$CURRDIR/Sources/Java:$CURRDIR/Sources/SAX"         -classpath "/tmp/nanoxml-lite-build-$$:/tmp/nanoxml-build-$$:/tmp/nanoxml-sax-build-$$:$CURRDIR/Thirdparty/SAX/sax.jar"         -d "$CURRDIR/Documentation/JavaDoc" -version -author -windowtitle "NanoXML 2.2.3"         net.n3.nanoxml         net.n3.nanoxml.sax         nanoxml >"/tmp/javadoc.log" 2>&1 || (cat /tmp/javadoc.log; exit 1) || exit 1
-+javadoc -source 1.8 -protected -sourcepath "$CURRDIR/Sources/Lite:$CURRDIR/Sources/Java:$CURRDIR/Sources/SAX"         -classpath "${CURDIR}/tmp/nanoxml-lite-build-$$:${CURDIR}/tmp/nanoxml-build-$$:${CURDIR}/tmp/nanoxml-sax-build-$$"         -d "$CURRDIR/Documentation/JavaDoc" -version -author -windowtitle "NanoXML 2.2.3" -link "$CURRDIR"        net.n3.nanoxml         net.n3.nanoxml.sax         nanoxml >"${CURDIR}/tmp/javadoc.log" 2>&1 || (cat ${CURDIR}/tmp/javadoc.log; exit 1) || exit 1
++javadoc -notimestamp -source 1.8 -protected -sourcepath "$CURRDIR/Sources/Lite:$CURRDIR/Sources/Java:$CURRDIR/Sources/SAX"         -classpath "${CURDIR}/tmp/nanoxml-lite-build-$$:${CURDIR}/tmp/nanoxml-build-$$:${CURDIR}/tmp/nanoxml-sax-build-$$"         -d "$CURRDIR/Documentation/JavaDoc" -version -author -windowtitle "NanoXML 2.2.3" -link "$CURRDIR"        net.n3.nanoxml         net.n3.nanoxml.sax         nanoxml >"${CURDIR}/tmp/javadoc.log" 2>&1 || (cat ${CURDIR}/tmp/javadoc.log; exit 1) || exit 1
  
 -rm -rf "/tmp/nanoxml-lite-build-$$"
 -rm -rf "/tmp/nanoxml-sax-build-$$"

nanoxml-jar-mtime.patch

@@ -0,0 +1,31 @@
+--- NanoXML-2.2.3/build.sh	2024-09-25 09:24:32.219097035 +0200
++++ NanoXML-2.2.3/build.sh	2024-09-25 09:32:26.275640105 +0200
+@@ -8,13 +8,15 @@
+ echo "Compiling NanoXML/Lite 2.2.3"
+ mkdir "${CURDIR}/tmp/nanoxml-lite-build-$$"
+ (cd Sources/Lite; javac -deprecation -target 1.8 -source 1.8 -g:none -d "${CURDIR}/tmp/nanoxml-lite-build-$$" nanoxml/*.java) || exit 1
+-(cd ${CURDIR}/tmp/nanoxml-lite-build-$$; jar cf "$CURRDIR/Output/nanoxml-lite.jar" nanoxml/*.class) || exit 1
++(cd ${CURDIR}/tmp/nanoxml-lite-build-$$; jar --verbose --create --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" \
++    --file="$CURRDIR/Output/nanoxml-lite.jar" nanoxml/*.class) || exit 1
+ (cd Test/Lite; javac -target 1.8 -source 1.8 -classpath ":$CURRDIR/Output/nanoxml-lite.jar:." DumpXML_Lite.java) || exit 1
+ 
+ echo "Compiling NanoXML/Java 2.2.3"
+ mkdir "${CURDIR}/tmp/nanoxml-build-$$"
+ (cd Sources/Java; javac -deprecation -target 1.8 -source 1.8 -g:none -d "${CURDIR}/tmp/nanoxml-build-$$" net/n3/nanoxml/*.java) || exit 1
+-(cd ${CURDIR}/tmp/nanoxml-build-$$; jar cf "$CURRDIR/Output/nanoxml.jar" net/n3/nanoxml/*.class) || exit 1
++(cd ${CURDIR}/tmp/nanoxml-build-$$; jar --verbose --create --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" \
++    --file="$CURRDIR/Output/nanoxml.jar" net/n3/nanoxml/*.class) || exit 1
+ (cd Test/Java; javac -target 1.8 -source 1.8 -classpath ":$CURRDIR/Output/nanoxml.jar:." DumpXML.java) || exit 1
+ 
+ echo "Compiling NanoXML/SAX 2.2.3"
+@@ -27,7 +29,8 @@
+     do cp "${CURDIR}/tmp/nanoxml-build-$$/net/n3/nanoxml/$a" "${CURDIR}/tmp/nanoxml-sax-build-$$/net/n3/nanoxml/"
+   done
+ (cd Sources/SAX; javac -target 1.8 -source 1.8 -g:none -d "${CURDIR}/tmp/nanoxml-build-$$" net/n3/nanoxml/sax/*.java) || exit 1
+-(cd ${CURDIR}/tmp/nanoxml-build-$$; jar cf "$CURRDIR/Output/nanoxml-sax.jar" net/n3/nanoxml/sax/*.class)
++(cd ${CURDIR}/tmp/nanoxml-build-$$; jar --verbose --create --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" \
++    --file="$CURRDIR/Output/nanoxml-sax.jar" net/n3/nanoxml/sax/*.class)
+ 
+ echo "Generating JavaDoc"
+ mkdir "$CURRDIR/Documentation/JavaDoc"
+Only in NanoXML-2.2.3: nanoxml-jar-mtime.patch

nanoxml.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep 25 07:41:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * nanoxml-jar-mtime.patch
+    + Use SOURCE_DATE_EPOCH for reproducible jar mtime
+- Modified patch:
+  * nanoxml-build.patch
+    + Generate javadoc without hidden timestamps
+
 -------------------------------------------------------------------
 Wed Feb 21 21:40:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

nanoxml.spec

@@ -28,6 +28,7 @@ Source0:        NanoXML-2.2.3.tar.bz2
 Source1:        %{name}-java-1.4.2-package-list
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-%{version}_enum.patch
+Patch2:         %{name}-jar-mtime.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-tools
@@ -81,6 +82,9 @@ Java documentation for %{name}.
 %setup -q -n NanoXML-%{version}
 %patch -P 0
 %patch -P 1
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
+%patch -P 2 -p1
+%endif
 cp %{SOURCE1} package-list
 find . -name "*.jar" -delete
 
@@ -91,12 +95,11 @@ sh ./build.sh
 # jars
 install -dm 755 %{buildroot}%{_javadir}
 install -pm 644 Output/%{name}-lite.jar \
-  %{buildroot}%{_javadir}/%{name}-lite-%{version}.jar
+  %{buildroot}%{_javadir}/%{name}-lite.jar
 install -pm 644 Output/%{name}-sax.jar \
-  %{buildroot}%{_javadir}/%{name}-sax-%{version}.jar
+  %{buildroot}%{_javadir}/%{name}-sax.jar
 install -pm 644 Output/%{name}.jar \
-  %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+  %{buildroot}%{_javadir}/%{name}.jar
 
 # javadoc
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -104,13 +107,10 @@ cp -pr Documentation/JavaDoc/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-sax-%{version}.jar
 %{_javadir}/%{name}-sax.jar
 
 %files lite
-%{_javadir}/%{name}-lite-%{version}.jar
 %{_javadir}/%{name}-lite.jar
 
 %files manual