Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2024-09-29 18:13:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new.29891 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot" Sun Sep 29 18:13:20 2024 rev:75 rq:1204347 version:5.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2024-09-23 15:19:24.974460741 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new.29891/plplot.changes 2024-09-29 18:13:59.841958397 +0200 @@ -1,0 +2,8 @@ +Thu Sep 26 17:17:45 UTC 2024 - Fridrich Strba <[email protected]> + +- Added patch: + * plplot-reproducible-jar-mtime.patch + + Use SOURCE_DATE_EPOCH for reproducible jar mtime + + Applied if building with Java >= 17 + +------------------------------------------------------------------- New: ---- plplot-reproducible-jar-mtime.patch BETA DEBUG BEGIN: New:- Added patch: * plplot-reproducible-jar-mtime.patch + Use SOURCE_DATE_EPOCH for reproducible jar mtime BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.orqKxi/_old 2024-09-29 18:14:00.613990293 +0200 +++ /var/tmp/diff_new_pack.orqKxi/_new 2024-09-29 18:14:00.617990458 +0200 @@ -83,6 +83,8 @@ Patch7: plplot-pkgconfig-includedir.patch # PATCH-FIX-UPSTREAM plplot-numpy-2.0-compat.patch gh#PLplot/PLplot#10 [email protected] -- Make plplot compilation compatible with numpy >= 2.0 Patch8: plplot-numpy-2.0-compat.patch +# PATCH-FIX-SUSE +Patch9: plplot-reproducible-jar-mtime.patch # List based on build_ada in gcc.spec ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le s390 s390x ia64 aarch64 riscv64 BuildRequires: cmake >= 3.13.2 @@ -1082,7 +1084,20 @@ ########################################################################## %prep -%autosetup -p1 +%setup +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 5 -p1 +%patch -P 6 -p1 +%patch -P 7 -p1 +%patch -P 8 -p1 +# The "--date" option was added into jar in OpenJDK 17 +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} +%patch -P 9 -p1 +%endif %build for file in NEWS README.release ++++++ plplot-reproducible-jar-mtime.patch ++++++ --- plplot-5.15.0/examples/java/CMakeLists.txt 2024-09-26 18:42:42.679062899 +0200 +++ plplot-5.15.0/examples/java/CMakeLists.txt 2024-09-26 19:09:37.234642501 +0200 @@ -60,6 +60,15 @@ "33" ) +if (DEFINED ENV{SOURCE_DATE_EPOCH}) + execute_process( + COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" "+%Y-%m-%dT%H:%M:%SZ" + OUTPUT_VARIABLE COMPILATION_DATE + OUTPUT_STRIP_TRAILING_WHITESPACE) +else () + string (TIMESTAMP COMPILATION_DATE "+%Y-%m-%dT%H:%M:%SZ") +endif () + if(CORE_BUILD) set(java_SRCS) foreach(STRING_INDEX ${java_STRING_INDICES}) @@ -133,7 +142,8 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot.jar COMMAND ${CMAKE_Java_ARCHIVE} - -cf ${CMAKE_CURRENT_BINARY_DIR}/plplot.jar -C ${CMAKE_BINARY_DIR}/bindings/java plplot/core -C ${CMAKE_CURRENT_BINARY_DIR} plplot/examples + --date=${COMPILATION_DATE} --create --file=${CMAKE_CURRENT_BINARY_DIR}/plplot.jar + -C ${CMAKE_BINARY_DIR}/bindings/java plplot/core -C ${CMAKE_CURRENT_BINARY_DIR} plplot/examples DEPENDS ${java_CLASSES} ${java_CORE_CLASSES} )
