Merge branch 'master' into etersoft

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

 %define oname winetricks
 Name: wine-etersoft-winetricks
-Version: 20220617
-Release: alt2
+Version: 20230120
+Release: alt1
 
 Summary: Work around common problems in Wine
 
@@ -15,7 +15,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
@@ -34,8 +33,8 @@ Conflicts: wine-vanilla < 3.18
 Conflicts: wine < 3.18
 Conflicts: wine-etersoft < 4.0
 
-Provides: winetricks = %EVR
-Conflicts: winetricks < %EVR
+Provides: %oname = %EVR
+Conflicts: %oname < %EVR
 
 %description
 Winetricks is an easy way to work around common problems in Wine.
@@ -46,7 +45,6 @@ or tweak various Wine settings individually.
  
 %prep
 %setup
-%patch1 -p1
 %patch2 -p1
 
 # fix req. Disable autoreq at all?
@@ -55,8 +53,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
 
@@ -82,6 +79,9 @@ desktop-file-validate %buildroot%_desktopdir/%oname.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
+
 * Sun Aug 14 2022 Vitaly Lipatov <lav@altlinux.ru> 20220617-alt2
 - rename package to wine-etersoft-winetricks
 

winetricks/README.md

@@ -123,7 +123,7 @@ chmod +x update_winetricks
 su root sh -c 'mv update_winetricks /usr/bin/'
 ```
 
-To use ```curl``` instead of ```wget```: subsitute all ```wget``` calls with ```curl -O```, in the winetricks update script.
+To use ```curl``` instead of ```wget```: substitute all ```wget``` calls with ```curl -O```, in the winetricks update script.
 
 
 # Updating

winetricks/files/verbs/all.txt

@@ -46,7 +46,7 @@ qqintl                   QQ International Instant Messenger 2.11 (Tencent, 2014)
 safari                   Safari (Apple, 2010) [downloadable]
 sketchup                 SketchUp 8 (Google, 2012) [downloadable]
 steam                    Steam (Valve, 2010) [downloadable]
-uplay                    Uplay (Ubisoft, 2013) [downloadable]
+ubisoftconnect           Ubisoft Connect (Ubisoft, 2020) [downloadable]
 utorrent                 µTorrent 2.2.1 (BitTorrent, 2011)
 utorrent3                µTorrent 3.4 (BitTorrent, 2011) [downloadable]
 vc2005express            MS Visual C++ 2005 Express (Microsoft, 2005) [downloadable]

winetricks/files/verbs/apps.txt

@@ -45,7 +45,7 @@ qqintl                   QQ International Instant Messenger 2.11 (Tencent, 2014)
 safari                   Safari (Apple, 2010) [downloadable]
 sketchup                 SketchUp 8 (Google, 2012) [downloadable]
 steam                    Steam (Valve, 2010) [downloadable]
-uplay                    Uplay (Ubisoft, 2013) [downloadable]
+ubisoftconnect           Ubisoft Connect (Ubisoft, 2020) [downloadable]
 utorrent                 µTorrent 2.2.1 (BitTorrent, 2011)
 utorrent3                µTorrent 3.4 (BitTorrent, 2011) [downloadable]
 vc2005express            MS Visual C++ 2005 Express (Microsoft, 2005) [downloadable]

winetricks/files/verbs/download.txt

@@ -357,10 +357,10 @@ tmnationsforever
 trebuchet
 trine_demo_steam
 trine_steam
+ubisoftconnect
 uff
 unifont
 updspapi
-uplay
 urlmon
 usp10
 utorrent3

winetricks/misc/filelists/README.txt

 This is a list of what files are in the helper verbs (i.e., DirectX / Service Packs)
 
-Checking into git makes it a lost easier to search without having to manually extract
+Checking into git makes it a lot easier to search without having to manually extract
 the files just to see if a native one is easily available.

winetricks/src/linkcheck.sh

@@ -101,7 +101,7 @@ crawl_one() {
     base=${urlfile%.url}
     url="$(cat "${urlfile}")"
 
-    curl --connect-timeout 10 --retry 6 -s -S -I "${url}" 2>&1 |
+    curl --connect-timeout 60 --retry-connrefused --retry 10 -s -S -I "${url}" 2>&1 |
         tr -d '\015' |
         grep . |
         sort > "${base}.log"

winetricks/src/release.sh

@@ -96,13 +96,13 @@ fi
 git archive --prefix="winetricks-${version}/" -o "${tmpdir}/${version}.tar.gz" "${version}"
 
 # create a detached signature of the tarball
-gpg --armor --default-key 0x053F0749 --detach-sign "${tmpdir}/${version}.tar.gz"
+gpg --armor --default-key 0x267BCC1F053F0749 --detach-sign "${tmpdir}/${version}.tar.gz"
 
 # upload the detached signature to github:
 if [ ${nopush} = 1 ] ; then
     echo "--no-push used, not uploading signature file"
 else
-    python3 src/github-api-releases.py  "${tmpdir}/${version}.tar.gz.asc" Winetricks winetricks "${version}"
+    python3 src/github-api-releases.py "${tmpdir}/${version}.tar.gz.asc" Winetricks winetricks "${version}"
     rm -rf "${tmpdir}"
 fi
 

winetricks/tests/shell-checks

@@ -58,7 +58,7 @@ test_bashate() {
     # Can't ignore individual things for now, filed bug:
     # https://bugs.launchpad.net/bash8/+bug/1698088
     # E006=line length check
-    # E044=Use [[ for non-POSIX comparisions
+    # E044=Use [[ for non-POSIX comparisons
     echo "Checking ${shellscript} with bashate:"
     w_try "${bashate}" -i E006,E044 "${shellscript}"
 }
@@ -106,7 +106,7 @@ test_linkcheck() {
     # Check for uses of variables in w_download when w_linkcheck_ignore isn't set
     # Using w_download https://example.com/${file1} breaks src/linkcheck.sh
     # FIXME: technically '$' is valid in a URL, if there's actually a URL using it this will need a tweak
-    if grep "^ *w_download " src/winetricks | grep -E "ftp|http" | grep -v "w_linkcheck_ignore=1" | sed "s/^ *//"  | tr -d "\\\\" | cut -d " " -f2 | grep "\\$"; then
+    if grep "^ *w_download " src/winetricks | grep -E "ftp|http" | grep -v "w_linkcheck_ignore=1" | sed "s/^ *//"  | tr -d "\\\\" | grep "\\$"; then
         w_die "Do not use variables in these URLs, it breaks src/linkcheck.sh"
     else
         echo "linkcheck checks passed"