From 36e7cdc0b4030b4f1591b8356f834e3f7165e1763e9b97c435c6c002cfba44a2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 13 Sep 2023 13:53:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=136 --- ...-builds-keep-order-of-aliases-and-depend.patch | 15 +++++++++++++++ javapackages-tools.changes | 8 ++++++++ javapackages-tools.spec | 3 ++- 3 files changed, 25 insertions(+), 1 deletion(-) rename metadata-artifact.patch => 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch (53%) diff --git a/metadata-artifact.patch b/0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch similarity index 53% rename from metadata-artifact.patch rename to 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch index 8cd3946..c387837 100644 --- a/metadata-artifact.patch +++ b/0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch @@ -1,3 +1,15 @@ +From f211da6e4cf216a020b47ccab9b2c7806c5a8a62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +Date: Wed, 13 Sep 2023 15:47:54 +0200 +Subject: [PATCH 4/4] Reproducible builds: keep order of aliases and + dependencies + +--- + python/javapackages/metadata/artifact.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/python/javapackages/metadata/artifact.py b/python/javapackages/metadata/artifact.py +index 72e57e62..f5cbf3be 100644 --- a/python/javapackages/metadata/artifact.py +++ b/python/javapackages/metadata/artifact.py @@ -52,8 +52,8 @@ class MetadataArtifact(ObjectBinding): @@ -11,3 +23,6 @@ 'properties': dict} def __init__(self, *args, **kwargs): +-- +2.42.0 + diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 3e4fc29..fcc13dc 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 13 13:52:00 UTC 2023 - Fridrich Strba + +- Added patch: + * 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch + + make the aliases and dependencies lists so that the order is + kept + ------------------------------------------------------------------- Tue Sep 12 09:54:08 UTC 2023 - Fridrich Strba diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9d02ba8..5a71b47 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -51,7 +51,8 @@ Patch3: 0001-Make-maven_depmap-order-of-aliases-reproducible.patch Patch4: 0002-Do-not-bomb-on-relativePath-construct.patch #PATCH-FIX-UPSTREAM: Sort exclusions when writing out metadata Patch5: 0003-Reproducible-exclusions-order-in-maven-metadata.patch -Patch6: metadata-artifact.patch +#PATCH-FIX-UPSTREAM: make the aliases and dependencies lists so that the order is kept +Patch6: 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: perl