pool/javapackages-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- remove-pointless-assignment.patch: Remove pointless assignment if

Browse Source 
%java_home is unset

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=165
This commit is contained in:
Fridrich Strba 2024-10-09 08:05:32 +00:00 committed by Git OBS Bridge
parent f5584bc386
commit ade27d18fe
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javapackages-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 9 07:27:42 UTC 2024 - Andreas Schwab <schwab@suse.de>
- remove-pointless-assignment.patch: Remove pointless assignment if
%java_home is unset
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 8 22:48:45 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Oct 8 22:48:45 UTC 2024 - Fridrich Strba <fstrba@suse.com>

2
javapackages-tools.spec
View File

@ -50,6 +50,8 @@ Patch2: suse-no-epoch.patch
Patch3: do-not-require-which.patch Patch3: do-not-require-which.patch
#PATCH-FIX-UPSTREAM: fix broken %%ant, %%jar, %%javadoc and %%javac commands #PATCH-FIX-UPSTREAM: fix broken %%ant, %%jar, %%javadoc and %%javac commands
Patch4: fix-broken-commands.patch Patch4: fix-broken-commands.patch
#PATCH-FIX-UPSTREAM Remove pointless assignment if %%java_home is unset
Patch5: remove-pointless-assignment.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: perl BuildRequires: perl

18
remove-pointless-assignment.patch Normal file
View File

@ -0,0 +1,18 @@
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\
\