Update tycho to version 1.6.0 / rev 11 via SR 1110002

https://build.opensuse.org/request/show/1110002 by user fstrba + anag+factory Reproducible builds improvement
bmwiedemann · Sep 10, 2023 · 5056f98 · 5056f98
1 parent a3da0c3
commit 5056f98
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/packages/t/tycho/.files b/packages/t/tycho/.files
diff --git a/packages/t/tycho/.rev b/packages/t/tycho/.rev
@@ -79,4 +79,12 @@
     <comment>Fix build with newer plexus-archiver</comment>
     <requestid>1109296</requestid>
   </revision>
+  <revision rev="11" vrev="8">
+    <srcmd5>fcd53911e117947708570e337ef32e36</srcmd5>
+    <version>1.6.0</version>
+    <time>1694344269</time>
+    <user>anag+factory</user>
+    <comment>Reproducible builds improvement</comment>
+    <requestid>1110002</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/t/tycho/tycho.changes b/packages/t/tycho/tycho.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Sep  9 14:56:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Reproducible builds: use SOURCE_DATE_EPOCH for timestamp
+
 -------------------------------------------------------------------
 Tue Sep  5 16:43:41 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/t/tycho/tycho.spec b/packages/t/tycho/tycho.spec
@@ -349,11 +349,13 @@ sed -i '
 %if %{with bootstrap}
     -j \
 %endif
-    -- -Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \
-    -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap \
+    -- \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
     -Dmaven.compiler.release=8 \
 %endif
+    -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
+    -Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \
+    -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap \
     -Dsource=8
 
 %{mvn_artifact} fedoraproject-p2/org.fedoraproject.p2/pom.xml