forked from pool/javapackages-tools
This commit is contained in:
Git OBS Bridge
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:08c5663e1f69c3d26f105dff181837b2be306ffd1ed1653fdbf3a63b60ab6274
|
||||
size 190905
|
||||
BIN
6.3.4.tar.gz
(Stored with Git LFS)
Normal file
BIN
6.3.4.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -1,47 +0,0 @@
|
||||
--- javapackages-6.3.2/javapackages-tools.spec 2024-10-08 08:19:44.208034468 +0200
|
||||
+++ javapackages-6.3.2/javapackages-tools.spec 2024-10-08 08:21:27.532053244 +0200
|
||||
@@ -22,7 +22,6 @@
|
||||
Source21: toolchains-openjdk21.xml
|
||||
|
||||
BuildRequires: coreutils
|
||||
-BuildRequires: which
|
||||
BuildRequires: make
|
||||
BuildRequires: rubygem-asciidoctor
|
||||
BuildRequires: %{python_prefix}-devel
|
||||
@@ -33,7 +32,6 @@
|
||||
Requires: javapackages-filesystem = %{version}-%{release}
|
||||
Requires: coreutils
|
||||
Requires: findutils
|
||||
-Requires: which
|
||||
|
||||
Provides: jpackage-utils = %{version}-%{release}
|
||||
|
||||
--- javapackages-6.3.2/java-utils/java-functions 2024-10-08 08:19:44.211367825 +0200
|
||||
+++ javapackages-6.3.2/java-utils/java-functions 2024-10-08 08:21:27.535386599 +0200
|
||||
@@ -169,7 +169,7 @@
|
||||
done
|
||||
fi
|
||||
|
||||
- JAVACMD=$(which java 2>/dev/null || :)
|
||||
+ JAVACMD=$(type -p java 2>/dev/null || :)
|
||||
if [ -x "${JAVACMD}" ]; then
|
||||
_log "Using JAVACMD from PATH: $JAVACMD"
|
||||
if [ -n "${JAVACMD_OPTS}" ]; then
|
||||
@@ -179,6 +179,8 @@
|
||||
JAVACMD="@{javadir}-utils/java-wrapper"
|
||||
fi
|
||||
return 0
|
||||
+ else
|
||||
+ unset JAVACMD
|
||||
fi
|
||||
|
||||
_err "Failed to set JAVACMD"
|
||||
@@ -315,7 +317,7 @@
|
||||
{
|
||||
local IFS=:
|
||||
local artifact="${1}"
|
||||
- local cmd=$(which xmvn-resolve 2>/dev/null || :)
|
||||
+ local cmd=$(type -p xmvn-resolve 2>/dev/null || :)
|
||||
|
||||
# If artifact contains semicolon then assume it specifies Maven
|
||||
# artifact coordinates.
|
||||
@@ -1,18 +0,0 @@
|
||||
--- 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
|
||||
|
||||
|
||||
#
|
||||
@@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 11 10:56:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 6.3.4
|
||||
* Changes:
|
||||
+ A corner case when which is not present
|
||||
+ Remove dependency on which
|
||||
+ Simplify after the which -> type -p change
|
||||
+ jpackage_script: Remove pointless assignment when %java_home
|
||||
is unset
|
||||
+ Don't require %java_home for %java etc.
|
||||
+ Don't export JAVA_HOME
|
||||
- Removed patches:
|
||||
* do-not-require-which.patch
|
||||
* fix-broken-commands.patch
|
||||
* remove-pointless-assignment.patch
|
||||
+ integrated upstream
|
||||
- Modified patch:
|
||||
* python-optional.patch
|
||||
+ account for changed context
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 9 07:27:42 UTC 2024 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ Name: javapackages-tools-%{flavor}
|
||||
%else
|
||||
Name: javapackages-tools
|
||||
%endif
|
||||
Version: 6.3.2
|
||||
Version: 6.3.4
|
||||
Release: 0
|
||||
Summary: Macros and scripts for Java packaging support
|
||||
License: BSD-3-Clause
|
||||
@@ -45,13 +45,6 @@ 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-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
|
||||
|
||||
@@ -29,7 +29,7 @@ Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
|
||||
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
|
||||
|
||||
test -z "${m2home}" && m2home="${datadir}/xmvn"
|
||||
-test -z "${pyinterpreter}" && pyinterpreter=$(which python)
|
||||
-test -z "${pyinterpreter}" && pyinterpreter=$(type -p python)
|
||||
test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"
|
||||
|
||||
eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem)
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
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\
|
||||
\
|
||||
Reference in New Issue
Block a user