diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 6bfd391..059cb2c 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 25 06:55:37 UTC 2021 - Fridrich Strba + +- 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 diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 76e3a50..40fb53d 100644 --- a/javapackages-tools.spec +++ b/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 diff --git a/sorted-aliases.patch b/sorted-aliases.patch new file mode 100644 index 0000000..111461a --- /dev/null +++ b/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)