20211221-alt1

patches/winetricks_msado15.patch

---- src/winetricks	2021-08-25 17:49:59.797348694 +0300
-+++ src/winetricks.new	2021-08-25 15:15:10.093371438 +0300
-@@ -22881,6 +22834,51 @@
-     w_set_winver winxp
- }
- 
-+#----------------------------------------------------------------
-+
-+w_metadata msado15 dlls
-+
-+load_msado15()
-+{
-+    w_download_to win2k3sp2_x64 https://download.microsoft.com/download/3/c/5/3c5c6364-27d3-4e18-bd04-244d0ec09dd4/WindowsServer2003.WindowsXP-KB914961-SP2-x64-ENU.exe
-+    w_try_cd "$W_TMP"
-+
-+
-+        cabextract -d "$W_TMP" -F  amd64/wow/wmsdart.dl_ "$W_CACHE"/win2k3sp2_x64/WindowsServer2003.WindowsXP-KB914961-SP2-x64-ENU.exe
-+
-+        cabextract -d "$W_TMP" -F  amd64/msdart.dl_ "$W_CACHE"/win2k3sp2_x64/WindowsServer2003.WindowsXP-KB914961-SP2-x64-ENU.exe
-+
-+
-+        cabextract -d "$W_SYSTEM32_DLLS" "$W_TMP"/amd64/wow/wmsdart.dl_ 
-+        cabextract -d "$W_SYSTEM64_DLLS" "$W_TMP"/amd64/msdart.dl_ 
-+        mv "$W_SYSTEM32_DLLS"/wmsdart.dll "$W_SYSTEM32_DLLS"/msdart.dll
-+
-+
-+
-+
-+        cabextract -d "$W_TMP" -F  amd64/wow/wmsado15.dl_ "$W_CACHE"/win2k3sp2_x64/WindowsServer2003.WindowsXP-KB914961-SP2-x64-ENU.exe
-+
-+        cabextract -d "$W_TMP" -F  amd64/msado15.dl_ "$W_CACHE"/win2k3sp2_x64/WindowsServer2003.WindowsXP-KB914961-SP2-x64-ENU.exe
-+
-+
-+        cabextract -d "$W_COMMONFILES_X86/System/ADO" "$W_TMP"/amd64/wow/wmsado15.dl_ 
-+        cabextract -d "$W_COMMONFILES/System/ADO" "$W_TMP"/amd64/msado15.dl_ 
-+        mv "$W_COMMONFILES_X86/System/ADO"/wmsado15.dll "$W_COMMONFILES_X86/System/ADO"/msado15.dll
-+
-+        w_override_dlls native msado15
-+
-+
-+        cd "$W_COMMONFILES"/System/ADO/
-+
-+
-+        "$WINE64" regsvr32 $W_UNATTENDED_SLASH_S "msado15.dll"
-+
-+        cd "$W_COMMONFILES_X86"/System/ADO/
-+
-+        "$WINE" regsvr32 $W_UNATTENDED_SLASH_S "msado15.dll"
-+}
-+#----------------------------------------------------------------
-+
- #---- Main Program ----
- 
- winetricks_stats_save()

patches/winetricks_vcrun2019.patch

-From 7eaa7ea824b0d6aa1073ee282426c784d41c8dbe Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Thu, 26 Aug 2021 01:54:51 +0300
-Subject: [PATCH] vcrun2019: update sha256sum (fix #1801)
-
----
- src/winetricks | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/winetricks b/src/winetricks
-index 4d2102f3..73ad6c5a 100755
---- a/src/winetricks
-+++ b/src/winetricks
-@@ -12996,12 +12996,13 @@ load_vcrun2019()
-     # 2021/04/05: e830c313aa99656748f9d2ed582c28101eaaf75f5377e3fb104c761bf3f808b2
-     # 2021/04/13: 14563755ac24a874241935ef2c22c5fce973acb001f99e524145113b2dc638c1
-     # 2021/06/06: 91c21c93a88dd82e8ae429534dacbc7a4885198361eae18d82920c714e328cf9
-+    # 2021/08/26: 1acd8d5ea1cdc3eb2eb4c87be3ab28722d0825c15449e5c9ceef95d897de52fa
- 
-     w_warn "ucrtbase.dll is no longer included in vcrun2019. For details see: https://github.com/Winetricks/winetricks/issues/1770"
- 
-     w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcr140 vcomp140 vcruntime140
- 
--    w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 91c21c93a88dd82e8ae429534dacbc7a4885198361eae18d82920c714e328cf9
-+    w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 1acd8d5ea1cdc3eb2eb4c87be3ab28722d0825c15449e5c9ceef95d897de52fa
- 
-     if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then
-         w_set_winver winxp
-@@ -13024,11 +13025,12 @@ load_vcrun2019()
-             # 2021/04/05: 015edd4e5d36e053b23a01adb77a2b12444d3fb6eccefe23e3a8cd6388616a16
-             # 2021/04/13: 52b196bbe9016488c735e7b41805b651261ffa5d7aa86eb6a1d0095be83687b2
-             # 2021/06/06: a1592d3da2b27230c087a3b069409c1e82c2664b0d4c3b511701624702b2e2a3
-+            # 2021/08/26: 003063723b2131da23f40e2063fb79867bae275f7b5c099dbd1792e25845872b
- 
-             # vcruntime140_1 is only shipped on x64:
-             w_override_dlls native,builtin vcruntime140_1
- 
--            w_download https://aka.ms/vs/16/release/vc_redist.x64.exe a1592d3da2b27230c087a3b069409c1e82c2664b0d4c3b511701624702b2e2a3
-+            w_download https://aka.ms/vs/16/release/vc_redist.x64.exe 003063723b2131da23f40e2063fb79867bae275f7b5c099dbd1792e25845872b
-             w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
-             ;;
-     esac

winetricks.spec

 Name: winetricks
-Version: 20210825.2
+Version: 20211221
 Release: alt1
 
 Summary: Work around common problems in Wine
@@ -10,13 +10,10 @@ Url: https://github.com/Winetricks/winetricks
 
 Packager: Vitaly Lipatov <lav@altlinux.ru>
 
-##Source-url: https://github.com/Winetricks/winetricks/archive/refs/heads/master.zip
-# Source-url: %url/archive/%version/%name-%version.tar.gz
+# Source-url: https://github.com/Winetricks/winetricks/archive/refs/heads/master.zip
+## Source-url: %url/archive/%version/%name-%version.tar.gz
 Source: %name-%version.tar
 
-Patch1: winetricks_msado15.patch
-Patch2: winetricks_vcrun2019.patch
-
 BuildArch: noarch
 
 ExclusiveArch: %ix86 x86_64 %arm aarch64
@@ -42,8 +39,6 @@ or tweak various Wine settings individually.
  
 %prep
 %setup
-%patch1 -p0
-%patch2 -p1
 
 # fix req. Disable autoreq at all?
 %__subst 's|fusermount|a= fusermount|' src/winetricks
@@ -74,6 +69,9 @@ desktop-file-validate %buildroot%_desktopdir/%name.desktop
 #exclude %_datadir/appdata/%name.appdata.xml
 
 %changelog
+* Wed Dec 29 2021 Vitaly Lipatov <lav@altlinux.ru> 20211221-alt1
+- new version (20211221) with rpmgs script
+
 * Thu Aug 26 2021 Vitaly Lipatov <lav@altlinux.ru> 20210825.2-alt1
 - add vcrun2019 update sha256sum
 - set our winetricks version during build