[packages/jpackage-utils] extend errors patch; rel 14

[atler]

commit 1b1891b0f01dd83684d083448e77bca9fc4b71b1
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Apr 24 13:05:31 2026 +0200

    extend errors patch; rel 14
    
    - output more errors to stderr
    - use return instead of exit
    - check status codes instead of relying on exit

 jpackage-utils-errors.patch    | 46 +++++++++++++++++++++++++++++++++++++++---
 jpackage-utils-noyelling.patch | 11 ----------
 jpackage-utils.spec            | 12 +++++------
 3 files changed, 48 insertions(+), 21 deletions(-)
---
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 50d80a9..5337b60 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -3,7 +3,7 @@ Summary:	JPackage utilities
 Summary(pl.UTF-8):	Narzędzia JPackage
 Name:		jpackage-utils
 Version:	1.7.5
-Release:	13
+Release:	14
 License:	BSD-like
 Group:		Development/Languages/Java
 Source0:	%{name}-%{version}.tar.bz2
@@ -11,10 +11,9 @@ Source0:	%{name}-%{version}.tar.bz2
 Patch0:		%{name}-pdksh.patch
 Patch1:		%{name}-checkdir.patch
 Patch2:		%{name}-errors.patch
-Patch3:		%{name}-noyelling.patch
-Patch4:		%{name}-readlink.patch
-Patch5:		%{name}-jvm_exports_via_link.patch
-Patch6:		java_version.patch
+Patch3:		%{name}-readlink.patch
+Patch4:		%{name}-jvm_exports_via_link.patch
+Patch5:		java_version.patch
 URL:		http://www.jpackage.org/
 BuildRequires:	rpmbuild(macros) >= 1.555
 Requires:	/bin/egrep
@@ -87,7 +86,6 @@ pliki XSL dla programu maven2, plik nagłówkowy dla plików spec itp.
 %patch -P3 -p1
 %patch -P4 -p1
 %patch -P5 -p1
-%patch -P6 -p1
 
 # we cp -a complete dir from source
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -159,7 +157,7 @@ install -d $RPM_BUILD_ROOT%{_javadir}-utils/xml
 cp -a xml/* $RPM_BUILD_ROOT%{_javadir}-utils/xml
 
 cat << 'EOF' >$RPM_BUILD_ROOT/etc/env.d/JAVA_HOME
-JAVA_HOME=$(. %{_javadir}-utils/java-functions 2>/dev/null; set_jvm >/dev/null 2>&1; echo "$JAVA_HOME")
+JAVA_HOME=$(. %{_javadir}-utils/java-functions >/dev/null 2>&1 && set_jvm >/dev/null 2>&1 && echo "$JAVA_HOME")
 EOF
 
 %clean
diff --git a/jpackage-utils-errors.patch b/jpackage-utils-errors.patch
index 6a18f5d..1d884cf 100644
--- a/jpackage-utils-errors.patch
+++ b/jpackage-utils-errors.patch
@@ -1,6 +1,37 @@
---- package-utils-1.6.6/java-utils/java-functions~	2006-11-30 17:11:17.000000000 +0200
-+++ package-utils-1.6.6/java-utils/java-functions	2007-01-24 01:03:00.137485318 +0200
-@@ -86,7 +86,7 @@
+--- jpackage-utils-1.7.5/java-utils/java-functions.orig	2026-04-24 12:48:34.924675953 +0200
++++ jpackage-utils-1.7.5/java-utils/java-functions	2026-04-24 13:02:16.799853956 +0200
+@@ -14,8 +14,8 @@
+ if [ -f /etc/java/java.conf ] ; then
+   . /etc/java/java.conf
+ else
+-  echo "Can't find configuration file, aborting"
+-  exit 1
++  echo "Can't find configuration file, aborting" >&2
++  return 1
+ fi
+ 
+ # Read user configuration file if it exists
+@@ -53,8 +53,8 @@
+     return
+   fi
+ 
+-  echo "Can't find java virtual machine, aborting."
+-  exit 1
++  echo "Can't find java virtual machine, aborting." >&2
++  return 1
+ }
+ 
+ # Set the classpath
+@@ -74,7 +74,7 @@
+   if [ -x "$JAVACMD" ]; then
+     return
+   fi
+-  set_jvm
++  set_jvm || return 1
+   # Add all sorts of jvm layouts here
+   if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+     JAVACMD="$JAVA_HOME/jre/sh/java"
+@@ -85,7 +85,7 @@
    fi
  
    if [ ! -x "$JAVACMD" ]; then
@@ -26,3 +57,12 @@
          return 1
      fi
  
+@@ -205,7 +205,7 @@
+                repository=$1
+                if ! [ -d "$repository" -a -w "$repository" ] ; then
+                   echo "$0: error: $1 must be a writable directory" >&2
+-                  exit 1
++                  return 1
+                fi
+             else
+                extension_list="$extension_list $1"
diff --git a/jpackage-utils-noyelling.patch b/jpackage-utils-noyelling.patch
deleted file mode 100644
index 68a5c30..0000000
--- a/jpackage-utils-noyelling.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN jpackage-utils-1.7.3.org/java-utils/java-functions jpackage-utils-1.7.3/java-utils/java-functions
---- jpackage-utils-1.7.3.org/java-utils/java-functions	2006-10-26 16:48:05.000000000 +0200
-+++ jpackage-utils-1.7.3/java-utils/java-functions	2008-07-19 10:48:36.799293016 +0200
-@@ -14,7 +14,6 @@
- if [ -f /etc/java/java.conf ] ; then
-   . /etc/java/java.conf
- else
--  echo "Can't find configuration file, aborting"
-   exit 1
- fi
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jpackage-utils.git/commitdiff/1b1891b0f01dd83684d083448e77bca9fc4b71b1