Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ant for openSUSE:Factory checked in
at 2023-09-12 21:02:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ant (Old)
and /work/SRC/openSUSE:Factory/.ant.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant"
Tue Sep 12 21:02:07 2023 rev:92 rq:1110311 version:1.10.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2023-09-01
14:18:48.551371894 +0200
+++ /work/SRC/openSUSE:Factory/.ant.new.1766/ant-antlr.changes 2023-09-12
21:02:12.602734554 +0200
@@ -1,0 +2,9 @@
+Mon Sep 11 12:50:03 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * reproducible-propertyfile-task.patch
+ + Debian patch to improve propertyfile task in RPM builds by
+ using the date specified by the SOURCE_DATE_EPOCH variable
+ in the header of the .properties file generated
+
+-------------------------------------------------------------------
ant-junit.changes: same change
ant-junit5.changes: same change
ant.changes: same change
New:
----
reproducible-propertyfile-task.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ant-antlr.spec ++++++
--- /var/tmp/diff_new_pack.Op4rF5/_old 2023-09-12 21:02:15.726845988 +0200
+++ /var/tmp/diff_new_pack.Op4rF5/_new 2023-09-12 21:02:15.726845988 +0200
@@ -44,6 +44,8 @@
# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed
"Created-by" in manifest
Patch5: reproducible-build-manifest.patch
Patch6: apache-ant-xml-apis.patch
+# PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp
in property files
+Patch7: reproducible-propertyfile-task.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
@@ -392,6 +394,7 @@
%patch3 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# clean jar files
find . -name "*.jar" -print -delete
ant-junit.spec: same change
ant-junit5.spec: same change
++++++ ant.spec ++++++
--- /var/tmp/diff_new_pack.Op4rF5/_old 2023-09-12 21:02:15.802848699 +0200
+++ /var/tmp/diff_new_pack.Op4rF5/_new 2023-09-12 21:02:15.802848699 +0200
@@ -43,6 +43,8 @@
# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed
"Created-by" in manifest
Patch5: reproducible-build-manifest.patch
Patch6: apache-ant-xml-apis.patch
+# PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp
in property files
+Patch7: reproducible-propertyfile-task.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
@@ -391,6 +393,7 @@
%patch3 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# clean jar files
find . -name "*.jar" -print -delete
++++++ reproducible-propertyfile-task.patch ++++++
--- apache-ant-1.10.14/src/main/org/apache/tools/ant/util/DateUtils.java
2023-09-11 14:41:39.980341631 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/util/DateUtils.java
2023-09-11 14:46:43.779148231 +0200
@@ -227,6 +227,10 @@
*/
public static String getDateForHeader() {
Calendar cal = Calendar.getInstance();
+ if (System.getenv("SOURCE_DATE_EPOCH") != null) {
+ cal.setTimeZone(TimeZone.getTimeZone("UTC"));
+ cal.setTime(new Date(1000 *
Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))));
+ }
TimeZone tz = cal.getTimeZone();
int offset = tz.getOffset(cal.get(Calendar.ERA),
cal.get(Calendar.YEAR),
@@ -247,6 +251,7 @@
}
tzMarker.append(minutes);
synchronized (DATE_HEADER_FORMAT_INT) {
+ DATE_HEADER_FORMAT_INT.setTimeZone(tz);
return DATE_HEADER_FORMAT_INT.format(cal.getTime()) +
tzMarker.toString();
}
}
