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 2024-10-09 22:03:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools"
Wed Oct 9 22:03:32 2024 rev:45 rq:1206476 version:6.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2024-10-08 17:16:54.222266824 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.19354/javapackages-tools.changes
2024-10-09 22:03:45.571218737 +0200
@@ -1,0 +2,14 @@
+Wed Oct 9 07:27:42 UTC 2024 - Andreas Schwab <sch...@suse.de>
+
+- remove-pointless-assignment.patch: Remove pointless assignment if
+ %java_home is unset
+
+-------------------------------------------------------------------
+Tue Oct 8 22:48:45 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * fix-broken-commands.patch
+ + fix commands broken after recent removal of the default
+ %%{java_home} macro
+
+-------------------------------------------------------------------
New:
----
fix-broken-commands.patch
remove-pointless-assignment.patch
BETA DEBUG BEGIN:
New:- Added patch:
* fix-broken-commands.patch
+ fix commands broken after recent removal of the default
New:
- remove-pointless-assignment.patch: Remove pointless assignment if
%java_home is unset
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javapackages-tools.spec ++++++
--- /var/tmp/diff_new_pack.2oBQLl/_old 2024-10-09 22:03:46.099240772 +0200
+++ /var/tmp/diff_new_pack.2oBQLl/_new 2024-10-09 22:03:46.099240772 +0200
@@ -48,6 +48,10 @@
#
#PATCH-FIX-UPSTREAM: do not fail if which does not exist
Patch3: do-not-require-which.patch
+#PATCH-FIX-UPSTREAM: fix broken %%ant, %%jar, %%javadoc and %%javac commands
+Patch4: fix-broken-commands.patch
+#PATCH-FIX-UPSTREAM Remove pointless assignment if %%java_home is unset
+Patch5: remove-pointless-assignment.patch
BuildRequires: fdupes
BuildRequires: perl
++++++ fix-broken-commands.patch ++++++
--- a/macros.d/macros.jpackage
+++ b/macros.d/macros.jpackage
@@ -10,11 +10,11 @@
#==============================================================================
# ---- default Java commands
-%ant %{?jpb_env} JAVA_HOME=%{java_home} ant
-%jar %{java_home}/bin/jar
+%ant %{?jpb_env} ant
+%jar jar
%java %(. @{javadir}-utils/java-functions; set_javacmd; echo
$JAVACMD)
-%javac %{java_home}/bin/javac
-%javadoc %{java_home}/bin/javadoc
+%javac javac
+%javadoc javadoc
#
++++++ remove-pointless-assignment.patch ++++++
Index: javapackages-6.3.2/macros.d/macros.jpackage
===================================================================
--- javapackages-6.3.2.orig/macros.d/macros.jpackage
+++ javapackages-6.3.2/macros.d/macros.jpackage
@@ -35,10 +35,10 @@ cat > %{buildroot}%{_bindir}/%5 << EOF \
#\
# %{name} script\
# JPackage Project <http://www.jpackage.org/>\
-\
+%{?java_home:\
# 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\
\
