Commit d5350ca7 authored by Vitaly Lipatov's avatar Vitaly Lipatov

20181203-alt2

- fix zenity/kdialog requires (ALT bug 35750)
parent 961ce30d
Name: winetricks Name: winetricks
Version: 20181203 Version: 20181203
Release: alt1 Release: alt2
Summary: Work around common problems in Wine Summary: Work around common problems in Wine
...@@ -21,8 +21,9 @@ ExclusiveArch: %ix86 x86_64 %arm aarch64 ...@@ -21,8 +21,9 @@ ExclusiveArch: %ix86 x86_64 %arm aarch64
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
# runtime dependencies # runtime dependencies
#Requires: wine-common #Requires: /usr/bin/wine
Requires: cabextract gzip unzip wget which Requires: cabextract gzip unzip wget which
#Requires: hicolor-icon-theme #Requires: hicolor-icon-theme
Conflicts: wine-vanilla < 3.18 Conflicts: wine-vanilla < 3.18
Conflicts: wine < 3.18 Conflicts: wine < 3.18
...@@ -66,6 +67,9 @@ desktop-file-validate %buildroot%_desktopdir/%name.desktop ...@@ -66,6 +67,9 @@ desktop-file-validate %buildroot%_desktopdir/%name.desktop
#exclude %_datadir/appdata/%name.appdata.xml #exclude %_datadir/appdata/%name.appdata.xml
%changelog %changelog
* Wed Dec 19 2018 Vitaly Lipatov <lav@altlinux.ru> 20181203-alt2
- fix zenity/kdialog requires (ALT bug 35750)
* Fri Dec 07 2018 Vitaly Lipatov <lav@altlinux.ru> 20181203-alt1 * Fri Dec 07 2018 Vitaly Lipatov <lav@altlinux.ru> 20181203-alt1
- new version 20181203 (with rpmrb script) - new version 20181203 (with rpmrb script)
......
...@@ -3524,16 +3524,16 @@ winetricks_mkprefixmenu() ...@@ -3524,16 +3524,16 @@ winetricks_mkprefixmenu()
case $WINETRICKS_GUI in case $WINETRICKS_GUI in
zenity) zenity)
zenity --forms --text="" --title "$_W_msg_title" \ $WINETRICKS_GUI --forms --text="" --title "$_W_msg_title" \
--add-combo="$_W_msg_arch" --combo-values=32\|64 \ --add-combo="$_W_msg_arch" --combo-values=32\|64 \
--add-entry="$_W_msg_name" \ --add-entry="$_W_msg_name" \
| sed -e 's/^\s*|/64|/' -e 's/^/arch=/' -e 's/|/ prefix=/' | sed -e 's/^\s*|/64|/' -e 's/^/arch=/' -e 's/|/ prefix=/'
;; ;;
kdialog) kdialog)
kdialog --title="$_W_msg_title" \ $WINETRICKS_GUI --title="$_W_msg_title" \
--radiolist="$_W_msg_arch" 32 32bit off 64 64bit on \ --radiolist="$_W_msg_arch" 32 32bit off 64 64bit on \
| sed -e 's/^$/64/' -e 's/^/arch=/' | sed -e 's/^$/64/' -e 's/^/arch=/'
kdialog --title="$_W_msg_title" --inputbox="$_W_msg_name" \ $WINETRICKS_GUI --title="$_W_msg_title" --inputbox="$_W_msg_name" \
| sed -e 's/^/prefix=/' | sed -e 's/^/prefix=/'
;; ;;
esac esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment