OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=88

javapackages-tools.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May 25 06:55:37 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * sorted-aliases.patch
+    + Always output aliases in alphabetical order in order to
+      have reproducible builds (bsc#1110028)
+
 -------------------------------------------------------------------
 Thu Mar 25 16:27:58 UTC 2021 - Ben Greiner <code@bnavigator.de>
 

javapackages-tools.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package javapackages-tools
+# spec file
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -45,6 +45,8 @@ Patch1:         python-optional.patch
 #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did
 #               Avoid generating unresolvable requires
 Patch2:         suse-no-epoch.patch
+#PATCH-FIX-SUSE: Sort the aliases to avoid unnecessary difference between packages
+Patch3:         sorted-aliases.patch
 BuildRequires:  asciidoc
 BuildRequires:  fdupes
 BuildRequires:  perl
@@ -101,7 +103,6 @@ Requires:       javapackages-tools = %{version}
 This package contains files needed by local mode for Gradle, which
 allows artifact resolution using XMvn resolver.
 
-
 %package -n javapackages-ivy
 Summary:        Local mode for Apache Ivy (files)
 Group:          Development/Languages/Java
@@ -124,6 +125,7 @@ Module for handling, querying and manipulating of various files for Java
 packaging in Linux distributions
 
 %else
+
 %package -n python3-javapackages
 Summary:        Module for handling various files for Java packaging
 Group:          Development/Languages/Java
@@ -241,6 +243,7 @@ popd
 %files -n javapackages-filesystem -f files-filesystem
 
 %else
+
 %files -n javapackages-local -f files-local
 %dir %{_datadir}/java-utils
 

sorted-aliases.patch

@@ -0,0 +1,11 @@
+--- javapackages-5.3.1/java-utils/maven_depmap.py	2019-06-14 12:26:27.000000000 +0200
++++ javapackages-5.3.1/java-utils/maven_depmap.py	2021-05-25 07:21:15.947065331 +0200
+@@ -180,7 +180,7 @@
+ 
+     aliases = additions.split(',')
+     result = list()
+-    for a in aliases:
++    for a in sorted(aliases):
+         alias = MetadataAlias.from_mvn_str(a)
+         alias.extension = artifact.extension
+         result.append(alias)