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-12 13:24:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools"
Sat Oct 12 13:24:51 2024 rev:46 rq:1207246 version:6.3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2024-10-09 22:03:45.571218737 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.19354/javapackages-tools.changes
2024-10-12 13:25:04.998679555 +0200
@@ -1,0 +2,24 @@
+Fri Oct 11 10:56:13 UTC 2024 - Fridrich Strba <fst...@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
+- Added patch:
+ * 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch
+ + This change breaks build with rpm 4.14.1
+
+-------------------------------------------------------------------
Old:
----
6.3.2.tar.gz
do-not-require-which.patch
fix-broken-commands.patch
remove-pointless-assignment.patch
New:
----
0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch
6.3.4.tar.gz
BETA DEBUG BEGIN:
Old:- Removed patches:
* do-not-require-which.patch
* fix-broken-commands.patch
Old: * do-not-require-which.patch
* fix-broken-commands.patch
* remove-pointless-assignment.patch
Old: * fix-broken-commands.patch
* remove-pointless-assignment.patch
+ integrated upstream
BETA DEBUG END:
BETA DEBUG BEGIN:
New:- Added patch:
* 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch
+ This change breaks build with rpm 4.14.1
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javapackages-tools.spec ++++++
--- /var/tmp/diff_new_pack.XLnM5v/_old 2024-10-12 13:25:05.606704754 +0200
+++ /var/tmp/diff_new_pack.XLnM5v/_new 2024-10-12 13:25:05.606704754 +0200
@@ -30,7 +30,7 @@
%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 @@
#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
++++++ 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch ++++++
>From 5f1ea127c2465e2a628396c17157834c73d528c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
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 <http://www.jpackage.org/>\
-%{?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
++++++ 6.3.2.tar.gz -> 6.3.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-6.3.2/VERSION
new/javapackages-6.3.4/VERSION
--- old/javapackages-6.3.2/VERSION 2024-10-04 12:02:35.000000000 +0200
+++ new/javapackages-6.3.4/VERSION 2024-10-10 10:57:36.000000000 +0200
@@ -1 +1 @@
-6.3.0
+6.3.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-6.3.2/configure
new/javapackages-6.3.4/configure
--- old/javapackages-6.3.2/configure 2024-10-04 12:02:35.000000000 +0200
+++ new/javapackages-6.3.4/configure 2024-10-10 10:57:36.000000000 +0200
@@ -84,7 +84,7 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-6.3.2/java-utils/java-functions
new/javapackages-6.3.4/java-utils/java-functions
--- old/javapackages-6.3.2/java-utils/java-functions 2024-10-04
12:02:35.000000000 +0200
+++ new/javapackages-6.3.4/java-utils/java-functions 2024-10-10
10:57:36.000000000 +0200
@@ -42,7 +42,7 @@
_log()
{
if [ -n "${JAVAPACKAGES_DEBUG}" ]; then
- echo "${0}: ${@}" >&2
+ echo "${0}: ${@}" >&2
fi
}
@@ -59,12 +59,12 @@
local JNI_LIBDIR
if [ -f "${1}" ]; then
- _log "Loading config file: ${1}"
- . "${1}"
+ _log "Loading config file: ${1}"
+ . "${1}"
- _javadirs="${_javadirs}${_javadirs:+:}${JAVA_LIBDIR}:${JNI_LIBDIR}"
+ _javadirs="${_javadirs}${_javadirs:+:}${JAVA_LIBDIR}:${JNI_LIBDIR}"
else
- _log "Skipping config file ${1}: file does not exist"
+ _log "Skipping config file ${1}: file does not exist"
fi
}
@@ -83,16 +83,16 @@
_log "Java config directories are:"
for javaconfdir; do
- _log " * ${javaconfdir}"
+ _log " * ${javaconfdir}"
done
for javaconfdir; do
- conf="${javaconfdir}/java.conf"
- if [ ! -f "${conf}" ]; then
- _err "Java configuration directory ${javaconfdir} was ignored
because configuration file ${conf} does not exist"
- else
- _load_java_conf_file "${conf}"
- fi
+ conf="${javaconfdir}/java.conf"
+ if [ ! -f "${conf}" ]; then
+ _err "Java configuration directory ${javaconfdir} was ignored
because configuration file ${conf} does not exist"
+ else
+ _load_java_conf_file "${conf}"
+ fi
done
_load_java_conf_file "${HOME}/.java/java.conf"
@@ -100,10 +100,10 @@
_javadirs=${_javadirs:-@{javadir}:@{jnidir}}
if [ -d "${java_home_save}" ]; then
- JAVA_HOME="${java_home_save}"
+ JAVA_HOME="${java_home_save}"
fi
if [ -n "${java_opts_save}" ]; then
- JAVACMD_OPTS="${java_opts_save}"
+ JAVACMD_OPTS="${java_opts_save}"
fi
if [ "_${JAVA_ABRT}" != "_off" -a -f
"@{abrtlibdir}/libabrt-java-connector.so" ]; then
@@ -149,7 +149,7 @@
local cmd
if [ -x "${JAVACMD}" ]; then
- return
+ return
fi
# Add all sorts of jvm layouts here
@@ -169,16 +169,18 @@
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
- _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}"
- export _JP_JAVACMD="${JAVACMD}"
- export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}"
- JAVACMD="@{javadir}-utils/java-wrapper"
- fi
- return 0
+ _log "Using JAVACMD from PATH: $JAVACMD"
+ if [ -n "${JAVACMD_OPTS}" ]; then
+ _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}"
+ export _JP_JAVACMD="${JAVACMD}"
+ export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}"
+ JAVACMD="@{javadir}-utils/java-wrapper"
+ fi
+ return 0
+ else
+ unset JAVACMD
fi
_err "Failed to set JAVACMD"
@@ -191,8 +193,8 @@
FLAGS=""
set -- "${@}" ${ADDITIONAL_FLAGS}
while [ $# -gt 0 ]; do
- FLAGS="${FLAGS}${FLAGS:+ }'$(echo "$1"|sed "s#[']#'\\\\''#g")'"
- shift
+ FLAGS="${FLAGS}${FLAGS:+ }'$(echo "$1"|sed "s#[']#'\\\\''#g")'"
+ shift
done
}
@@ -202,8 +204,8 @@
OPTIONS=""
set -- "${@}" ${ADDITIONAL_OPTIONS}
while [ $# -gt 0 ]; do
- OPTIONS="${OPTIONS}${OPTIONS:+ }'$(echo "$1"|sed "s#[']#'\\\\''#g")'"
- shift
+ OPTIONS="${OPTIONS}${OPTIONS:+ }'$(echo "$1"|sed "s#[']#'\\\\''#g")'"
+ shift
done
}
@@ -213,12 +215,12 @@
set_javacmd
if [ -n "${VERBOSE}" ]; then
- echo "Java virtual machine used: ${JAVACMD}"
- echo "classpath used: ${CLASSPATH}"
- echo "main class used: ${MAIN_CLASS}"
- echo "flags used: ${FLAGS}"
- echo "options used: ${OPTIONS}"
- echo "arguments used: ${@}"
+ echo "Java virtual machine used: ${JAVACMD}"
+ echo "classpath used: ${CLASSPATH}"
+ echo "main class used: ${MAIN_CLASS}"
+ echo "flags used: ${FLAGS}"
+ echo "options used: ${OPTIONS}"
+ echo "arguments used: ${@}"
fi
# let's start
@@ -315,43 +317,43 @@
{
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.
set -- ${artifact}
if [ ${#} -gt 1 ]; then
- if [ -z "${cmd}" ]; then
+ if [ -z "${cmd}" ]; then
echo "${0}: Unable to find xmvn-resolve." >&2
echo "${0}: Make sure that xmvn-resolve package is installed." >&2
return 1
- fi
- _log "Using xmvn-resolve: ${cmd}"
+ fi
+ _log "Using xmvn-resolve: ${cmd}"
- "${cmd}" -c "${artifact}"
- return ${?}
+ "${cmd}" -c "${artifact}"
+ return ${?}
fi
set -- ${_javaverdirs} ${_javadirs}
_log "JAR search path is:"
for dir; do
- _log " * ${dir}"
+ _log " * ${dir}"
done
for artifact in ${artifact%.jar} ${artifact%-*} ${artifact%/*}; do
- for dir; do
- _log "Trying file ${dir}/${artifact}.jar"
- if [ -r "${dir}/${artifact}.jar" ]; then
- echo "${dir}/${artifact}.jar"
- return 0
- fi
- _log "Trying dir ${dir}/${artifact}/"
- if [ -d "${dir}/${artifact}" ]; then
- echo "${dir}/${artifact}"
- return 0
- fi
- done
+ for dir; do
+ _log "Trying file ${dir}/${artifact}.jar"
+ if [ -r "${dir}/${artifact}.jar" ]; then
+ echo "${dir}/${artifact}.jar"
+ return 0
+ fi
+ _log "Trying dir ${dir}/${artifact}/"
+ if [ -d "${dir}/${artifact}" ]; then
+ echo "${dir}/${artifact}"
+ return 0
+ fi
+ done
done
_err "Could not find ${artifact} Java extension for this JVM"
@@ -363,8 +365,8 @@
check_java_env()
{
if [ -z "${JAVACMD}" ]; then
- _err "JAVACMD must be set"
- return 2
+ _err "JAVACMD must be set"
+ return 2
fi
return 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-6.3.2/javapackages-tools.spec
new/javapackages-6.3.4/javapackages-tools.spec
--- old/javapackages-6.3.2/javapackages-tools.spec 2024-10-04
12:02:35.000000000 +0200
+++ new/javapackages-6.3.4/javapackages-tools.spec 2024-10-10
10:57:36.000000000 +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}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-6.3.2/macros.d/macros.jpackage
new/javapackages-6.3.4/macros.d/macros.jpackage
--- old/javapackages-6.3.2/macros.d/macros.jpackage 2024-10-04
12:02:35.000000000 +0200
+++ new/javapackages-6.3.4/macros.d/macros.jpackage 2024-10-10
10:57:36.000000000 +0200
@@ -10,11 +10,11 @@
#==============================================================================
# ---- default Java commands
-%ant %{?jpb_env} JAVA_HOME=%{java_home} ant
-%jar %{java_home}/bin/jar
-%java %(. @{javadir}-utils/java-functions; set_javacmd; echo
$JAVACMD)
-%javac %{java_home}/bin/javac
-%javadoc %{java_home}/bin/javadoc
+%ant %{?jpb_env} %{?java_home:JAVA_HOME=%{java_home}} ant
+%jar %{?java_home:%{java_home}/bin/}jar
+%java %{?java_home:%{java_home}/bin/}java
+%javac %{?java_home:%{java_home}/bin/}javac
+%javadoc %{?java_home:%{java_home}/bin/}javadoc
#
@@ -35,10 +35,10 @@
#\
# %{name} script\
# JPackage Project <http://www.jpackage.org/>\
-\
-# Set default JAVA_HOME\
-export 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\
\
++++++ python-optional.patch ++++++
--- /var/tmp/diff_new_pack.XLnM5v/_old 2024-10-12 13:25:06.050723156 +0200
+++ /var/tmp/diff_new_pack.XLnM5v/_new 2024-10-12 13:25:06.054723321 +0200
@@ -29,7 +29,7 @@
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)
