Accepting request 1108778 from Java:packages

6.2.0

OBS-URL: https://build.opensuse.org/request/show/1108778
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javapackages-tools?expand=0&rev=37

0001-Make-the-alias-generation-reproducible.patch

@@ -0,0 +1,25 @@
+From 88ca6f13c707652c9992e9f7f4b86c5bdc198d03 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b31e5d858c7a1d62cc6e95450590a4e4526237403ecfad34d1a39a1f496d673
-size 155816

javapackages-tools.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Sep  2 23:07:32 UTC 2023 - Fridrich Strba <fstrba@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
+
 -------------------------------------------------------------------
 Mon Aug 21 14:49:36 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

javapackages-tools.spec

@@ -30,7 +30,7 @@ Name:           javapackages-tools-%{flavor}
 %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 @@ 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: 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 @@ BuildArch:      noarch
 %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 @@ popd
 
 %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