From 652c804939e593ab0a71028a02d4d397a94c4e4ba5d9787579e584a026226bfe Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 27 Nov 2015 14:27:25 +0000
Subject: [PATCH] - Updated to 1.8-rc2 codefreeze snapshot   - bugfixes only -
 winetricks updated

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=325
---
 wine-1.8-rc1.tar.bz2      |  3 ---
 wine-1.8-rc1.tar.bz2.sign | 17 -----------------
 wine-1.8-rc2.tar.bz2      |  3 +++
 wine-1.8-rc2.tar.bz2.sign | 17 +++++++++++++++++
 wine.changes              |  7 +++++++
 wine.spec                 |  4 ++--
 winetricks                | 14 ++++++++++++++
 7 files changed, 43 insertions(+), 22 deletions(-)
 delete mode 100644 wine-1.8-rc1.tar.bz2
 delete mode 100644 wine-1.8-rc1.tar.bz2.sign
 create mode 100644 wine-1.8-rc2.tar.bz2
 create mode 100644 wine-1.8-rc2.tar.bz2.sign

diff --git a/wine-1.8-rc1.tar.bz2 b/wine-1.8-rc1.tar.bz2
deleted file mode 100644
index 8c09d31..0000000
--- a/wine-1.8-rc1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b4684f62718db4348fbf022c6fd76b38587ce8aadadb633d9afecc90c0e1bf8
-size 22819231
diff --git a/wine-1.8-rc1.tar.bz2.sign b/wine-1.8-rc1.tar.bz2.sign
deleted file mode 100644
index 4d42406..0000000
--- a/wine-1.8-rc1.tar.bz2.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJWTyR2AAoJEM76yOqvF1GdPSAQAIQxzX8YUD75IVMxIPAKoauY
-fMh5mZTF5MPuOekgSBq0A6DAuPy6XgR++qmI/3j7XaJt0sp5GZ6lUY1Oct3RP/pl
-Xc3B7JM7Qfw4X3wb7zA03e4eq/EFeWdDlxbCQvD7cGUVtiUY+xkMABZ6kUSyralS
-cUgJ0yea14JUpPjUQrxjW64rBW/UBb9NkYkUoY+2ZvnSmLwZ7nnRNGAoHloMylvE
-DTxTT4AH+Of5AUuWPZyIt1tyd+OBK8i+BZgmNlxI9T4ea8QmF3mFN3tMKWhSlgns
-YJbFer1MoVMtWhlOBdLXKN7eM0DnXO0wckcFH/Hym6oUqRQ5bxRx6qxt/kZ3UYwD
-Gz64q2Se7Thzh5kj7eU41gCdLiZTt0h8Cf64vgsA9UysdscysRlQ8g/gYaVUmpD0
-lOEKmAr/9FQ8fx2N6k2Es6rmB38fM+pM/Xj8hzSkqNuTPF7WKymaE4J34QA+Nv7G
-xgD3rkP28c1fClYwylhpDmLiBCwRpIHRq7DzWv76wG9a+fFOI4f2h8vYoCpaaZUa
-QsXSiNtOl1e+N5P/g1QZlvyoJeqJ23go1fMqNVZ31rmvYwiEdlYzyStu9IL6lIyh
-KMfFc63Yq4ln0oIJUkr8yGiPj8gN4lG7w6F9KhVrjJWKRrZ1VR5jRTrs+hY5WLfg
-o1mcjjBxLxK1JmG8qhgZ
-=+vBg
------END PGP SIGNATURE-----
diff --git a/wine-1.8-rc2.tar.bz2 b/wine-1.8-rc2.tar.bz2
new file mode 100644
index 0000000..d9f1ecd
--- /dev/null
+++ b/wine-1.8-rc2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7063ac1921e0f19a65bf3142e4b112c1b552b18b8d180e53f372a65b9399f73c
+size 22825267
diff --git a/wine-1.8-rc2.tar.bz2.sign b/wine-1.8-rc2.tar.bz2.sign
new file mode 100644
index 0000000..3f75e41
--- /dev/null
+++ b/wine-1.8-rc2.tar.bz2.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWWGZsAAoJEM76yOqvF1GdWB8P/0OJmrmqmp2XLMEbqLg+7VLf
+z7fVIclmNdwTUadqvsj1h58/MDFPCdmg77ygVK9T5VAxAYFeRfM+8ciQ/bwpTvov
+QyMF98PC79uhINjwGeO3kkDFd36PBlHLTPRZuleuWOxTIN5rQTx1uSFCehdYVcrw
+l2NhyQjXE2ddmUwAi/3YmUg2XkX6FtAcUmErcWXCn5ldU05Xq7ON4VJaPI6pz1ic
+wjh/qU0cG/1kivcOSZrs1PKuFat94rPNyp6Rp5yJ2iGyYNIdQL99ZtAsf6xcYrCb
+zGK+1W2P+dqZlu8tWcxK1V9NLDPO4+AH3In7EDYTCTLRyQosdRa+fbEsrr2I2D+a
+vJd8Lb2n/ewnObahl2RcepfsNkEglYT9izXvP2qN/94AD7UUoCsk3JLxuvxsSZqN
+hVq1KoxFBx5oixSfLrAJaTGHyVXS5u7l1mNFN2Az0HUFvniqldsqr3OCh7nSJL5a
+WG+yDXsC3ANiQuHc6W7DGKuHw2MEDak4hHEUQZNKU5hzt+n4ExjZcxDuIbzEqh9O
+xLcZU5cVg3ztRuxCd/6+jVCRkeG0D6vrRXgfHu8kEfMtTLAfpUr+7wcCPFpYLxH3
+YmkdM36Y4tCJGPCtDYwBb4RdzB7bFCCIUq6NFd26PCHzg0/z9mLK+jttrNIM0Od4
+5EX1zSpT21aVeA+qGkrJ
+=ooOI
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index c6b718f..59a1e32 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 27 14:26:22 UTC 2015 - meissner@suse.com
+
+- Updated to 1.8-rc2 codefreeze snapshot
+  - bugfixes only
+- winetricks updated
+
 -------------------------------------------------------------------
 Fri Nov 20 13:52:33 UTC 2015 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 358e2da..c59ff84 100644
--- a/wine.spec
+++ b/wine.spec
@@ -53,8 +53,8 @@ BuildRequires:  sane-backends-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
-%define realver 1.8-rc1
-Version:        1.8~rc1
+%define realver 1.8-rc2
+Version:        1.8~rc2
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 21fd8ec..97ac15b 100644
--- a/winetricks
+++ b/winetricks
@@ -8165,6 +8165,13 @@ load_vcrun2015()
         cp "$W_TMP"/vccorlib140.dll "$W_SYSTEM32_DLLS"/vccorlib140.dll
         cp "$W_TMP"/vcomp140.dll "$W_SYSTEM32_DLLS"/vcomp140.dll
         cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM32_DLLS"/vcruntime140.dll
+
+        w_override_dlls native,builtin api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140
+        cp "$W_TMP"/api_ms_win_crt_heap_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-heap-l1-1-0.dll
+        cp "$W_TMP"/api_ms_win_crt_locale_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-locale-l1-1-0.dll
+        cp "$W_TMP"/api_ms_win_crt_runtime_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-runtime-l1-1-0.dll
+        cp "$W_TMP"/api_ms_win_crt_stdio_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-stdio-l1-1-0.dll
+        cp "$W_TMP"/ucrtbase.dll "$W_SYSTEM32_DLLS"/ucrtbase.dll
     else
         w_try "$WINE" vc_redist.x86.exe $W_UNATTENDED_SLASH_Q
     fi
@@ -8190,6 +8197,13 @@ load_vcrun2015()
             cp "$W_TMP"/vccorlib140.dll "$W_SYSTEM64_DLLS"/vccorlib140.dll
             cp "$W_TMP"/vcomp140.dll "$W_SYSTEM64_DLLS"/vcomp140.dll
             cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM64_DLLS"/vcruntime140.dll
+
+            w_override_dlls native,builtin api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140
+            cp "$W_TMP"/api_ms_win_crt_heap_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-heap-l1-1-0.dll
+            cp "$W_TMP"/api_ms_win_crt_locale_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-locale-l1-1-0.dll
+            cp "$W_TMP"/api_ms_win_crt_runtime_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-runtime-l1-1-0.dll
+            cp "$W_TMP"/api_ms_win_crt_stdio_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-stdio-l1-1-0.dll
+            cp "$W_TMP"/ucrtbase.dll "$W_SYSTEM64_DLLS"/ucrtbase.dll
         else
             w_try "$WINE" vc_redist.x64.exe $W_UNATTENDED_SLASH_Q
         fi