Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2023-09-10 13:09:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools"
Sun Sep 10 13:09:22 2023 rev:38 rq:1109307 version:6.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2023-09-06 18:55:51.778574475 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1766/javapackages-tools.changes
2023-09-10 13:09:32.037061805 +0200
@@ -1,0 +2,12 @@
+Tue Sep 5 11:40:09 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Modified patch:
+ * 0001-Make-the-alias-generation-reproducible.patch ->
+ 0001-Make-maven_depmap-order-of-aliases-reproducible.patch
+ + replace by the version of patch integrated by upstream
+- Added patch:
+ * 0002-Do-not-bomb-on-relativePath-construct.patch
+ + integrated patch fixing parent recursion with empty
+ <relativePath/> element
+
+-------------------------------------------------------------------
Old:
----
0001-Make-the-alias-generation-reproducible.patch
New:
----
0001-Make-maven_depmap-order-of-aliases-reproducible.patch
0002-Do-not-bomb-on-relativePath-construct.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javapackages-tools.spec ++++++
--- /var/tmp/diff_new_pack.8TeHtd/_old 2023-09-10 13:09:33.397110396 +0200
+++ /var/tmp/diff_new_pack.8TeHtd/_new 2023-09-10 13:09:33.401110539 +0200
@@ -45,8 +45,10 @@
#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: Let maven_depmap.py generate reproducible list of aliases
-Patch3: 0001-Make-the-alias-generation-reproducible.patch
+#PATCH-FIX-UPSTREAM: Make maven_depmap order of aliases reproducible
+Patch3: 0001-Make-maven_depmap-order-of-aliases-reproducible.patch
+#PATCH-FIX-UPSTREAM: Do not bomb on <relativePath/> construct
+Patch4: 0002-Do-not-bomb-on-relativePath-construct.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
++++++ 0001-Make-maven_depmap-order-of-aliases-reproducible.patch ++++++
>From 5cc434bdeffbee25158ae2bdcda08f4b07610f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Mon, 4 Sep 2023 16:14:43 +0200
Subject: [PATCH 1/2] Make maven_depmap order of aliases reproducible
---
java-utils/maven_depmap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 6a0520fa..4bfb877d 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -213,7 +213,7 @@ def add_aliases(artifact, additions):
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)
--
2.42.0
++++++ 0002-Do-not-bomb-on-relativePath-construct.patch ++++++
>From d124f4d16883d74cdf8ab9064667e128a3695230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Mon, 4 Sep 2023 22:44:10 +0200
Subject: [PATCH 2/2] Do not bomb on <relativePath/> construct
---
java-utils/mvn_artifact.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index a45946cd..b7520528 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -167,7 +167,7 @@ def gather_dependencies(pom_path):
parent = pom.parent
while parent:
ppom = None
- if parent.relativePath:
+ if hasattr(parent, 'relativePath') and parent.relativePath:
try:
ppom_path = os.path.join(os.path.dirname(curr_pom._path),
parent.relativePath)
--
2.42.0
