OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=156

0001-Double-quote-to-avoid-substitution-during-build.patch

@@ -1,25 +0,0 @@
-From 5ede44f34a30011908b7dfc911d9c9bc270f1abc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
-Date: Thu, 3 Oct 2024 11:21:43 +0200
-Subject: [PATCH] Double-quote to avoid substitution during build
-
----
- macros.d/macros.jpackage | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
-index adfff436..55d4ba94 100644
---- a/macros.d/macros.jpackage
-+++ b/macros.d/macros.jpackage
-@@ -37,7 +37,7 @@ cat > %{buildroot}%{_bindir}/%5 << EOF \
- # JPackage Project <http://www.jpackage.org/>\
- \
- # Set default JAVA_HOME\
--export JAVA_HOME="\\${JAVA_HOME:-%{?java_home}}"\
-+export JAVA_HOME="\\${JAVA_HOME:-%%{?java_home}}"\
- \
- # Source functions library\
- . @{javadir}-utils/java-functions\
--- 
-2.46.1
-

6.3.1.tar.gz

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

6.3.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08c5663e1f69c3d26f105dff181837b2be306ffd1ed1653fdbf3a63b60ab6274
+size 190905

javapackages-tools.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Oct  4 17:08:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 6.3.2
+  * Changes
+    + spec: Update Obsoletes versions
+    + Search for JAVACMD under JAVA_HOME only if it's set
+    + Obsolete set_jvm and set_jvm_dirs functions
+    + Drop unneeded _set_java_home function
+    + Remove JAVA_HOME check from check_java_env function
+    + Bump codecov/codecov-action from 2.0.2 to 4.6.0
+    + Bump actions/setup-python from 4 to 5
+    + Bump actions/checkout from 2 to 4
+    + Add custom dependabot config
+    + Remove the test for JAVA_HOME and error if it is not set
+    + java-functions: Remove unneeded local variables
+    + Fix build status shield
+- Removed patch:
+  * 0001-Double-quote-to-avoid-substitution-during-build.patch
+    + Fixed differently in this version
+
 -------------------------------------------------------------------
 Wed Oct  2 17:27:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

javapackages-tools.spec

@@ -30,7 +30,22 @@ Name:           javapackages-tools-%{flavor}
 %else
 Name:           javapackages-tools
 %endif
-Version:        6.3.1
+%if %{with python}
+%if 0%{?suse_version} >= 1550
+# TW: generate subpackages for every python3 flavor
+%define python_subpackage_only 1
+%else
+%python_subpackages
+%define python_sitelib %{python3_sitelib}
+%define python_files() -n python3-%{**}
+%endif
+BuildRequires:  %{python_module lxml}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  python-rpm-macros
+BuildArch:      noarch
+%endif
+Version:        6.3.2
 Release:        0
 Summary:        Macros and scripts for Java packaging support
 License:        BSD-3-Clause
@@ -45,36 +60,19 @@ 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
-Patch3:         0001-Double-quote-to-avoid-substitution-during-build.patch
-
 BuildRequires:  fdupes
 BuildRequires:  perl
 BuildRequires:  rpm
 BuildRequires:  xmlto
 BuildRequires:  rubygem(asciidoctor)
-%if %{with python}
-BuildRequires:  javapackages-filesystem
-%else
-Requires:       javapackages-filesystem = %{version}-%{release}
-%endif
 # Used on too many places
 Provides:       jpackage-utils = %{version}
 Obsoletes:      %{name}-doc
 Obsoletes:      jpackage-utils < %{version}
 %if %{with python}
-BuildRequires:  %{python_module lxml}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  python-rpm-macros
-BuildArch:      noarch
-%if 0%{?suse_version} >= 1550
-# TW: generate subpackages for every python3 flavor
-%define python_subpackage_only 1
-%python_subpackages
+BuildRequires:  javapackages-filesystem
 %else
-%define python_sitelib %python3_sitelib
-%define python_files() -n python3-%{**}
-%endif
+Requires:       javapackages-filesystem = %{version}-%{release}
 %endif
 
 %description