From 83137493d2d6be7ea3e2447cd93387ff06a8bb7ea1b38a114d290c201ed469f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2025 10:05:37 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main slf4j revision 2dd0fd6e49fce259310cedb616d5c475 --- slf4j.changes | 5 +++++ slf4j.spec | 24 ++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/slf4j.changes b/slf4j.changes index 9e07956..03b30d9 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 24 10:45:44 UTC 2024 - Fridrich Strba + +- Use SOURCE_DATE_EPOCH for reproducible jar mtime + ------------------------------------------------------------------- Tue Feb 20 14:29:19 UTC 2024 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index f9d7f41..622cc91 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -178,14 +178,30 @@ ant -Dmaven2.jpp.mode=true \ # Sources for i in api ext jcl jdk14 reload4j nop simple; do mkdir -p %{name}-${i}/target - jar cf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/java . - jar uf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/resources . + jar \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} + --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ +%endif + --create --file=%{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/java . + jar \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} + --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ +%endif + --update --file=%{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/resources . done for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do mkdir -p ${i}/target - jar cf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/java . - jar uf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/resources . + jar \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} + --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ +%endif + --create --file=${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/java . + jar \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} + --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ +%endif + --update --file=${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/resources . done %install