20220411-alt2

patches/066a2334ebc6fb608825949d7c642b1441bc403a.patch

+From 066a2334ebc6fb608825949d7c642b1441bc403a Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@etersoft.ru>
+Date: Mon, 23 May 2022 21:37:20 +0300
+Subject: [PATCH] fix detection for --gui without args
+
+---
+ src/winetricks | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/winetricks b/src/winetricks
+index cd2a344bb..2ede77ceb 100755
+--- a/src/winetricks
++++ b/src/winetricks
+@@ -3271,11 +3271,13 @@ winetricks_early_wine_arch()
+ 
+ winetricks_detect_gui()
+ {
+-    if [ -n "$1" ]; then
+-        if [ "$1" = "kdialog" ] && test -x "$(command -v kdialog 2>/dev/null)"; then
++    if [ "$1" = "--gui" ] && [ -n "$2" ] ; then
++        if [ "$2" = "kdialog" ] ; then
++            test -x "$(command -v kdialog 2>/dev/null)" || w_die "--gui kdialog is forced, but kdialog command is missed."
+             WINETRICKS_GUI=kdialog
+             WINETRICKS_GUI_VERSION="$(kdialog --version)"
+-        elif [ "$1" = "zenity" ] || [ "$1" = "--gui" ] && test -x "$(command -v zenity 2>/dev/null)"; then
++        elif [ "$2" = "zenity" ] ; then
++            test -x "$(command -v zenity 2>/dev/null)" || w_die "--gui zenity is forced, but zenity command is missed."
+             WINETRICKS_GUI=zenity
+             WINETRICKS_GUI_VERSION="$(zenity --version)"
+             WINETRICKS_MENU_HEIGHT=500

winetricks.spec

 Name: winetricks
 Version: 20220411
-Release: alt1
+Release: alt2
 
 Summary: Work around common problems in Wine
 
@@ -14,6 +14,8 @@ Packager: Vitaly Lipatov <lav@altlinux.ru>
 # Source-url: %url/archive/%version/%name-%version.tar.gz
 Source: %name-%version.tar
 
+Patch: 066a2334ebc6fb608825949d7c642b1441bc403a.patch
+
 BuildArch: noarch
 
 ExclusiveArch: %ix86 x86_64 %arm aarch64
@@ -39,6 +41,7 @@ or tweak various Wine settings individually.
  
 %prep
 %setup
+%patch -p1
 
 # fix req. Disable autoreq at all?
 %__subst 's|fusermount|a= fusermount|' src/winetricks
@@ -71,6 +74,9 @@ desktop-file-validate %buildroot%_desktopdir/%name.desktop
 #exclude %_datadir/appdata/%name.appdata.xml
 
 %changelog
+* Mon May 23 2022 Vitaly Lipatov <lav@altlinux.ru> 20220411-alt2
+- fix kdialog detection
+
 * Mon Apr 11 2022 Vitaly Lipatov <lav@altlinux.ru> 20220411-alt1
 - new version 20220411 (with rpmrb script)