From 50eb2f272d2f1290b0aafd2fd76b02078b49ab90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= <marian.koncek@mailbox.org>
Date: Wed, 18 Feb 2026 14:15:23 +0100
Subject: [PATCH 1/3] Use proper name for the Java launcher script

---
 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 35b288de..547ca638 100644
--- a/macros.d/macros.jpackage
+++ b/macros.d/macros.jpackage
@@ -33,7 +33,7 @@ install -d -m 755 %{buildroot}%{_bindir} \
 cat > %{buildroot}%{_bindir}/%5 << EOF \
 #!/bin/bash\
 #\
-# %{name} script\
+# %5 script\
 # JPackage Project <http://www.jpackage.org/>\
 %{?java_home:\
 # Set default JAVA_HOME\

From 694f00661dbd3a7d53b541d11fd7eea369fcbbe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= <marian.koncek@mailbox.org>
Date: Wed, 18 Feb 2026 14:16:09 +0100
Subject: [PATCH 2/3] Add an option to not set JAVA_HOME in the Java launcher
 script

---
 macros.d/macros.jpackage | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
index 547ca638..31e4485a 100644
--- a/macros.d/macros.jpackage
+++ b/macros.d/macros.jpackage
@@ -27,18 +27,20 @@
 # %3    options
 # %4    jars (separated by ':')
 # %5    the name of script you wish to create
+# [-h]
+#       do not set default JAVA_HOME
 #
-%jpackage_script() \
+%jpackage_script(h) \
 install -d -m 755 %{buildroot}%{_bindir} \
 cat > %{buildroot}%{_bindir}/%5 << EOF \
 #!/bin/bash\
 #\
 # %5 script\
 # JPackage Project <http://www.jpackage.org/>\
-%{?java_home:\
+%{!-h:%{?java_home:\
 # Set default JAVA_HOME\
 JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\
-}\
+}}\
 # Source functions library\
 . @{javadir}-utils/java-functions\
 \

From 12e4db601b2c43b88ff55eada85cb7ff3cd32042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= <marian.koncek@mailbox.org>
Date: Wed, 18 Feb 2026 14:17:02 +0100
Subject: [PATCH 3/3] Add an option to explicitly set the name of the
 configuration file for Java launcher script

---
 macros.d/macros.jpackage | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
index 31e4485a..cf773ed8 100644
--- a/macros.d/macros.jpackage
+++ b/macros.d/macros.jpackage
@@ -29,8 +29,10 @@
 # %5    the name of script you wish to create
 # [-h]
 #       do not set default JAVA_HOME
+# [-c <config file name>]
+#       name of the configuration file
 #
-%jpackage_script(h) \
+%jpackage_script(c:h) \
 install -d -m 755 %{buildroot}%{_bindir} \
 cat > %{buildroot}%{_bindir}/%5 << EOF \
 #!/bin/bash\
@@ -45,13 +47,13 @@ JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\
 . @{javadir}-utils/java-functions\
 \
 # Source system prefs\
-if [ -f %{_sysconfdir}/java/%{name}.conf ] ; then\
-  . %{_sysconfdir}/java/%{name}.conf\
+if [ -f %{_sysconfdir}/java/%{-c*}%{!-c:%{name}}.conf ] ; then\
+  . %{_sysconfdir}/java/%{-c*}%{!-c:%{name}}.conf\
 fi\
 \
 # Source user prefs\
-if [ -f \\$HOME/.%{name}rc ] ; then\
-  . \\$HOME/.%{name}rc\
+if [ -f \\$HOME/.%{-c*}%{!-c:%{name}}rc ] ; then\
+  . \\$HOME/.%{-c*}%{!-c:%{name}}rc\
 fi\
 \
 # Configuration\