diff --git a/0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch b/0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch new file mode 100644 index 0000000..f1e055a --- /dev/null +++ b/0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch @@ -0,0 +1,32 @@ +From 5f1ea127c2465e2a628396c17157834c73d528c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +Date: Fri, 11 Oct 2024 15:00:52 +0200 +Subject: [PATCH] Revert "jpackage_script: Remove unneeded backslashes" + +This is broken with rpm 4.14.1 for instance + +This reverts commit 098485a23336cf7df692631d7bbb90db200d554d. +--- + macros.d/macros.jpackage | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage +index b6c41b48..ceee2a7d 100644 +--- a/macros.d/macros.jpackage ++++ b/macros.d/macros.jpackage +@@ -35,9 +35,9 @@ cat > %{buildroot}%{_bindir}/%5 << EOF \ + #\ + # %{name} script\ + # JPackage Project \ +-%{?java_home: +-# Set default JAVA_HOME +-JAVA_HOME="\\${JAVA_HOME:-%{java_home}}" ++%{?java_home:\ ++# Set default JAVA_HOME\ ++JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\ + }\ + # Source functions library\ + . @{javadir}-utils/java-functions\ +-- +2.47.0 + diff --git a/6.3.2.tar.gz b/6.3.2.tar.gz deleted file mode 100644 index e15805c..0000000 --- a/6.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08c5663e1f69c3d26f105dff181837b2be306ffd1ed1653fdbf3a63b60ab6274 -size 190905 diff --git a/6.3.4.tar.gz b/6.3.4.tar.gz new file mode 100644 index 0000000..8ec8076 --- /dev/null +++ b/6.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a27cd4b196f8993e64f134d70cfa4d9dfff042e4ed2efd2097bfc35f562ee89 +size 190937 diff --git a/do-not-require-which.patch b/do-not-require-which.patch deleted file mode 100644 index 8a2cdbf..0000000 --- a/do-not-require-which.patch +++ /dev/null @@ -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. diff --git a/fix-broken-commands.patch b/fix-broken-commands.patch deleted file mode 100644 index af30a1f..0000000 --- a/fix-broken-commands.patch +++ /dev/null @@ -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 - - - # diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 8f8e2dc..dc6848e 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Oct 11 10:56:13 UTC 2024 - Fridrich Strba + +- 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 +- Added patch: + * 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch + + This change breaks build with rpm 4.14.1 + ------------------------------------------------------------------- Wed Oct 9 07:27:42 UTC 2024 - Andreas Schwab diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9d52aa7..a9b9655 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -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,8 @@ 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 +#PATCH-FIX-UPSTREAM: removing the backslashes breaks checks with rpm 4.14.1 +Patch3: 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch BuildRequires: fdupes BuildRequires: perl diff --git a/python-optional.patch b/python-optional.patch index 7dfdfc7..bab35e1 100644 --- a/python-optional.patch +++ b/python-optional.patch @@ -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) diff --git a/remove-pointless-assignment.patch b/remove-pointless-assignment.patch deleted file mode 100644 index a76c290..0000000 --- a/remove-pointless-assignment.patch +++ /dev/null @@ -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 \ --\ -+%{?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\ - \