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-06 18:55:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools"
Wed Sep 6 18:55:31 2023 rev:37 rq:1108778 version:6.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2023-08-22 08:55:04.082435866 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1766/javapackages-tools.changes
2023-09-06 18:55:51.778574475 +0200
@@ -1,0 +2,13 @@
+Sat Sep 2 23:07:32 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to upstream version 6.2.0
+ * Ãntegrate our changes from javapackages-6.1.0-maven-depmap.patch
+- Removed patch:
+ * javapackages-6.1.0-maven-depmap.patch
+ + upstreamed
+- Added patch:
+ * 0001-Make-the-alias-generation-reproducible.patch
+ + separate patch for our reproducible changes that was not
+ part of the integrated pull request
+
+-------------------------------------------------------------------
Old:
----
6.1.0.tar.gz
javapackages-6.1.0-maven-depmap.patch
New:
----
0001-Make-the-alias-generation-reproducible.patch
6.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javapackages-tools.spec ++++++
--- /var/tmp/diff_new_pack.4XZ4yC/_old 2023-09-06 18:55:53.158623671 +0200
+++ /var/tmp/diff_new_pack.4XZ4yC/_new 2023-09-06 18:55:53.162623813 +0200
@@ -30,7 +30,7 @@
%else
Name: javapackages-tools
%endif
-Version: 6.1.0
+Version: 6.2.0
Release: 0
Summary: Macros and scripts for Java packaging support
License: BSD-3-Clause
@@ -45,8 +45,8 @@
#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 metadata with dependencies under
certain circumstances
-Patch3: javapackages-%{version}-maven-depmap.patch
+#PATCH-FIX-SUSE: Let maven_depmap.py generate reproducible list of aliases
+Patch3: 0001-Make-the-alias-generation-reproducible.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
@@ -75,9 +75,6 @@
%define python_sitelib %python3_sitelib
%define python_files() -n python3-%{**}
%endif
-%else
-Provides: mvn(com.sun:tools) = SYSTEM
-Provides: mvn(sun.jdk:jconsole) = SYSTEM
%endif
%description
@@ -236,7 +233,7 @@
%else
-%files -n javapackages-local -f files-common -f files-extra -f files-compat -f
files-generators
+%files -n javapackages-local -f files-common -f files-compat -f
files-generators
%dir %{_datadir}/java-utils
%files -n javapackages-ivy -f files-ivy
++++++ 0001-Make-the-alias-generation-reproducible.patch ++++++
>From 88ca6f13c707652c9992e9f7f4b86c5bdc198d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Sun, 3 Sep 2023 01:03:26 +0200
Subject: [PATCH] Make the alias generation 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.41.0
++++++ 6.1.0.tar.gz -> 6.2.0.tar.gz ++++++
++++ 5542 lines of diff (skipped)
