20230120-alt1

patches/0001-fix-detection-for-gui-without-args.patch

-From e86950243c9de949269102aed1aa42d215fd2308 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 | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/winetricks b/src/winetricks
-index cd2a344..1058a50 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" ] ; then
-+        if [ "$1" = "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 [ "$1" = "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
-@@ -23097,7 +23099,7 @@ if ! test "${WINETRICKS_LIB}"; then
-             # GUI case
-             # No non-option arguments given, so read them from GUI, and loop until user quits
-             if [ ${WINETRICKS_GUI} = "none" ]; then
--                winetricks_detect_gui
-+                winetricks_detect_gui --gui
-             fi
-             winetricks_detect_sudo
-             test -z "${WINETRICKS_ISO_MOUNT}" && winetricks_detect_iso_mount
--- 
-2.33.3
-

winetricks.spec

 Name: winetricks
-Version: 20220617
+Version: 20230120
 Release: alt1
 
 Summary: Work around common problems in Wine
@@ -14,7 +14,6 @@ Packager: Vitaly Lipatov <lav@altlinux.ru>
 #Source-url: %url/archive/%version/%name-%version.tar.gz
 Source: %name-%version.tar
 
-Patch1: 0001-fix-detection-for-gui-without-args.patch
 Patch2: 0001-winetricks-try-use-xvt-as-terminal.patch
 
 BuildArch: noarch
@@ -42,7 +41,6 @@ or tweak various Wine settings individually.
  
 %prep
 %setup
-%patch1 -p1
 %patch2 -p1
 
 # fix req. Disable autoreq at all?
@@ -51,8 +49,7 @@ or tweak various Wine settings individually.
 sed -i -e "s:steam::" -e "s:flash::" tests/*
 
 %build
-# not needed
-#subst 's|WINETRICKS_VERSION=.*|WINETRICKS_VERSION=%version|' src/winetricks
+subst 's|WINETRICKS_VERSION=.*|WINETRICKS_VERSION=%version-%release|' src/winetricks
 # disable version checking
 subst 's|winetricks_latest_version_check$||' src/winetricks
 
@@ -78,6 +75,9 @@ desktop-file-validate %buildroot%_desktopdir/%name.desktop
 #exclude %_datadir/appdata/%name.appdata.xml
 
 %changelog
+* Sat Jan 21 2023 Vitaly Lipatov <lav@altlinux.ru> 20230120-alt1
+- new version (20230120) with rpmgs script
+
 * Sat Jun 18 2022 Vitaly Lipatov <lav@altlinux.ru> 20220617-alt1
 - new version (20220617) with rpmgs script
 - try use xvt as terminal (ALT bug 43003)