Merge branch 'master' into etersoft

winetricks.spec

 %define oname winetricks
 Name: wine-etersoft-winetricks
-Version: 20230505
+Version: 20231003
 Release: eter1
 
 Summary: Work around common problems in Wine
@@ -81,6 +81,9 @@ desktop-file-validate %buildroot%_desktopdir/%oname.desktop
 #exclude %_datadir/appdata/%name.appdata.xml
 
 %changelog
+* Fri Oct 06 2023 Vitaly Lipatov <lav@altlinux.ru> 20231003-eter1
+- new version 20231003 (with rpmrb script)
+
 * Sat May 20 2023 Vitaly Lipatov <lav@altlinux.ru> 20230505-eter1
 - new version (20230505) with rpmgs script
 

winetricks/.github/workflows/install.yml

 on: [push, pull_request]
+name: install
 jobs:
   macos:
     name: make install (with prefix)
     runs-on: macos-latest
     steps:
       - name: checkout project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       # OSX doesn't allow writing to /usr/bin, so skip the non-PREFIX check
       - name: run make install (with PREFIX)
         run: time make install PREFIX="$(mktemp -d)"
@@ -14,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: run make install (with PREFIX)
         run: time make install PREFIX="$(mktemp -d)"
       - name: run make install (without PREFIX)

winetricks/.github/workflows/shell-checks.yml

 on: [push, pull_request]
+name: shellcheck
 jobs:
   shellcheck:
     name: shellcheck
     runs-on: ubuntu-latest
     steps:
       - name: checkout project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: run shell-checks
         run: sudo apt-get -y install shellcheck python3-bashate && time ./tests/shell-checks

winetricks/.github/workflows/update.yml

 on: [push, pull_request]
+name: Update
 jobs:
   update:
     name: self-update-test
@@ -8,6 +9,6 @@ jobs:
         os: [macos-latest, ubuntu-latest]
     steps:
       - name: checkout project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: run self-update-test
         run: ./tests/self-update-test

winetricks/src/winetricks.1

@@ -27,7 +27,7 @@ Set country code to CC and don't detect your IP address
 when retrying downloads
 .TP
 .B
-\-\-force
+\-f, \-\-force
 Don't check whether packages were already installed
 .TP
 .B
@@ -35,10 +35,22 @@ Don't check whether packages were already installed
 Show GUI diagnostics even when driven by the command-line interface
 .TP
 .B
+\-\-gui=OPT
+Set OPT to kdialog or zenity to override GUI engine
+.TP
+.B
 \-\-isolate
 Install each app or game in its own bottle
 .TP
 .B
+\-\-self\-update
+Update this application to the last version
+.TP
+.B
+\-\-update\-rollback
+Rollback the last self update
+.TP
+.B
 \-k, \-\-keep_isos
 Cache ISOs (allows later installation without disc)
 .TP
@@ -51,6 +63,14 @@ Don't install each app or game in its own bottle (default)
 Don't delete temp directories (useful during debugging)
 .TP
 .B
+\-\-optin
+Opt in to reporting which verbs you use to the Winetricks maintainers
+.TP
+.B
+\-\-optout
+Opt out of reporting which verbs you use to the Winetricks maintainers
+.TP
+.B
 \-q, \-\-unattended
 Don't ask any questions, just install automatically
 .TP
@@ -59,10 +79,18 @@ Don't ask any questions, just install automatically
 Retry hard when caching scratched discs
 .TP
 .B
+\-t, \-\-torify
+Run downloads under torify, if available
+.TP
+.B
 \-v, \-\-verbose
 Echo all commands as they are executed
 .TP
 .B
+\-\-verify
+Run (automated) GUI tests for verbs, if available
+.TP
+.B
 \-h, \-\-help
 Display this message and exit
 .TP
@@ -85,10 +113,6 @@ dlls list
 list verbs in category 'dlls'
 .TP
 .B
-games list
-list verbs in category 'games'
-.TP
-.B
 fonts list
 list verbs in category 'fonts'
 .TP
@@ -172,17 +196,20 @@ See <https://www.gnu.org/licenses/>.
 .SH BUGS
 .PP
 Bugs may be reported at
-.I https://github.com/Winetricks/winetricks
+.I https://github.com/Winetricks/winetricks/issues
 .PP
 .SH AVAILABILITY
 The most recent version of
 .B winetricks
 can be downloaded from
-.I https://github.com/Winetricks/winetricks/releases
+.I https://github.com/Winetricks/winetricks/releases/latest
 .PP
 The latest snapshot of the code may be obtained via git; see
 .I https://github.com/Winetricks/winetricks/
 .PP
+Documentation for Winetricks can be found at
+.I https://github.com/Winetricks/winetricks/wiki
+.PP
 For further information about
 .B winetricks
 see