diff --git a/packages/h/hppc/.files b/packages/h/hppc/.files index 73cb6b4c923..d303734f593 100644 Binary files a/packages/h/hppc/.files and b/packages/h/hppc/.files differ diff --git a/packages/h/hppc/.rev b/packages/h/hppc/.rev index d36285e2b61..d0aa7be71aa 100644 --- a/packages/h/hppc/.rev +++ b/packages/h/hppc/.rev @@ -23,4 +23,12 @@ Standalone JavaEE inconditionally 965948 + + 9e4a4173eb85cf7999e842d55eb2f1a2 + 0.7.1 + + anag+factory + reproducible + 1111421 + diff --git a/packages/h/hppc/hppc-timestamp.patch b/packages/h/hppc/hppc-timestamp.patch new file mode 100644 index 00000000000..1e9b251346e --- /dev/null +++ b/packages/h/hppc/hppc-timestamp.patch @@ -0,0 +1,15 @@ +--- hppc-0.7.1/hppc-template-processor/src/main/java/com/carrotsearch/hppc/generator/TemplateOptions.java 2015-05-07 09:32:26.000000000 +0200 ++++ hppc-0.7.1/hppc-template-processor/src/main/java/com/carrotsearch/hppc/generator/TemplateOptions.java 2023-09-14 16:19:35.996103476 +0200 +@@ -88,7 +88,11 @@ + */ + public String getTimeNow() { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.ROOT); +- return format.format(new Date()); ++ Date now = new Date(); ++ if (System.getenv("SOURCE_DATE_EPOCH") != null) { ++ now = new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))); ++ } ++ return format.format(now); + } + + public String getTemplateFile() { diff --git a/packages/h/hppc/hppc.changes b/packages/h/hppc/hppc.changes index a370d8a1bfb..a357aef6495 100644 --- a/packages/h/hppc/hppc.changes +++ b/packages/h/hppc/hppc.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 14 15:27:47 UTC 2023 - Fridrich Strba + +- Added patch: + * hppc-timestamp.patch + + use SOURCE_DATE_EPOCH for timestamp in generated files + +------------------------------------------------------------------- +Wed Sep 13 06:30:04 UTC 2023 - Fridrich Strba + +- Reproducible builds: use SOURCE_DATE_EPOCH for timestamp + ------------------------------------------------------------------- Wed Mar 30 10:24:48 UTC 2022 - Fridrich Strba diff --git a/packages/h/hppc/hppc.spec b/packages/h/hppc/hppc.spec index aad329b01fb..20590d320dc 100644 --- a/packages/h/hppc/hppc.spec +++ b/packages/h/hppc/hppc.spec @@ -1,7 +1,7 @@ # # spec file for package hppc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ License: Apache-2.0 Group: Development/Libraries/Java URL: https://labs.carrotsearch.com/hppc.html Source0: https://github.com/carrotsearch/hppc/archive/%{version}.tar.gz +Patch0: hppc-timestamp.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(com.google.guava:guava) @@ -63,6 +64,8 @@ This package contains javadoc for HPPC. %prep %setup -q +%patch0 -p1 + find . -name "*.class" -print -delete find . -name "*.jar" -print -delete @@ -89,7 +92,9 @@ done %{mvn_package} :%{name}-template-processor %{name}-templateprocessor %build -%{mvn_build} -f -- -Dsource=8 +%{mvn_build} -f -- \ + -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ + -Dsource=8 %install %mvn_install