From 12759d5a01f0a2de95b33009103402e9a1e03858b10169280f9980a3ae06967a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 24 Jan 2017 22:45:18 +0000
Subject: [PATCH] - Updated to 2.0 final release

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=398
---
 wine-2.0-rc6.tar.bz2      |  3 ---
 wine-2.0-rc6.tar.bz2.sign | 16 ----------------
 wine-2.0.tar.bz2          |  3 +++
 wine-2.0.tar.bz2.sign     | 16 ++++++++++++++++
 wine.changes              |  5 +++++
 wine.spec                 |  4 ++--
 winetricks                |  7 +++----
 7 files changed, 29 insertions(+), 25 deletions(-)
 delete mode 100644 wine-2.0-rc6.tar.bz2
 delete mode 100644 wine-2.0-rc6.tar.bz2.sign
 create mode 100644 wine-2.0.tar.bz2
 create mode 100644 wine-2.0.tar.bz2.sign

diff --git a/wine-2.0-rc6.tar.bz2 b/wine-2.0-rc6.tar.bz2
deleted file mode 100644
index 8780c95..0000000
--- a/wine-2.0-rc6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e0521cd622ee4a9fbdd63b905ec21b3b3ca1d0f37ccd4a1449f0a8b122eb405
-size 23676397
diff --git a/wine-2.0-rc6.tar.bz2.sign b/wine-2.0-rc6.tar.bz2.sign
deleted file mode 100644
index e96bc2e..0000000
--- a/wine-2.0-rc6.tar.bz2.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAliCkIMACgkQzvrI6q8X
-UZ1uLw//TFXXnBsQx0qcGRk9PQV7aO0EXQr6MZjBLul1857XHgorxvvZF7IVk/ji
-lkBUt4FJzbQHVCVTXTxmfrK6XzUp8vjJoTHJOmHESXExhQSexPO3oogE/NxsDQWC
-pRuSG6v4KZ+AzmZ0txSTPYP4MFIRVPGsB7u6ZzyeI3m5lBdzvZSPpsnjKo5LUsFs
-38bcGInfWUH0lcpngMtCIQ2YyIZMaf4FeLmF/sbACAuVRdDXY01UI6NtJ97WrZTx
-kY0prv6IojBFF+6Q6N8Gk/gkNdwEGRtagXzWbuTDXrUxJ6vRIJqDF2lY5PAZhGy0
-EZ/mzZXqNfdKeTr3JLGoCrhLd9KiRkluj3IYroJ7T/fsWQSjFMdGDa1Ts4A1YqeV
-JIVXxoh03jdyGelNuE9Om/OpXJP/9wRJxKdsd23NoHEMNr1AB3/ZdfqQjVqIDzg8
-lPtBUHXHVlm/xvM1b6xxuCKeDxon0DEUQ9j0pRkQaN0AX0fiX14mhiFx7r6Q1ZdK
-wUXWdBkNDdV+c7+oC0WdHz+Mj6/klIzyoAHkAqmjfBbwad6u4J/qKV4DWeEVY529
-AaloLLZHOmrd5+btNfZOZX8vg5hf+i4VlIfxnUdPvQV81wrUbNqcWtiJDkyhFY4C
-fTp5MfI0JkObNTEGu9EQ4/Kq4V2U2scguFZ0YKpyYyhbsH/q1Gc=
-=CzHt
------END PGP SIGNATURE-----
diff --git a/wine-2.0.tar.bz2 b/wine-2.0.tar.bz2
new file mode 100644
index 0000000..fbc5437
--- /dev/null
+++ b/wine-2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6
+size 23662707
diff --git a/wine-2.0.tar.bz2.sign b/wine-2.0.tar.bz2.sign
new file mode 100644
index 0000000..a81e72f
--- /dev/null
+++ b/wine-2.0.tar.bz2.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAliHtsUACgkQzvrI6q8X
+UZ2Q1Q/5AY9GJXhOhDf3ZU7eDNnEyr3YJVoK7Y6ixaQu8ttXikkDGwyLV79av4IE
+sBwib1b3dnR9cj1YejFFeoSIaQYq/LCjVXt7Bi7S9W7ZezDvz+MH9ZmTj56FgaVi
++DAZRe6O6Ze9Fbs9qRoQ1rRl26oRLu0LRybyM3ELKLf4cI792JTScT05bJnnMaoK
+wRtUf9IL2m0Wfi/d0arI+Y8ppXNLvdGUDrQlOgXcftkz/GAI9r/CqYYUMgdh6+Oz
+9QKsmdWw7aG1Ycyg8ftJSIqciY4+WGdaO7aUKRbygk0bsDiExmmev13KVh/Z1rPD
+EVKSD/vJ687z5UCwLVxybKz38cM8+wpSDyAOIYLTYO4C5MTQDSV2oUINzbgY7tNE
+/N2ddsDw09YBsbG1ocozawd6MHWMBbFe/oabA0Jtwu/jwXTQisga0OoSgbS3h/Rn
+iDpb8T9TzzCM0VGrDbJ99QTu9kv+pc8fBgtQ7yM+akNYhs1osqeb+EL0sbkv/4k9
+Xew9kJFuV5x9t3sg6a4eyrCzh7G9TrDRViWMmK46ZDbRSnNof3sDwFQcPzNmy6+H
+vlsj2u7EHLB4tQ7MJ5A6nPuBuToO4PXcXrDVwKR8NcQrUOLL/5mmaTzErAEsZ9al
+TsdBdpwo6p1/gVu7RCD2hBdbtGvG09St/A+NTZPtBHVbD68P/YY=
+=PKbg
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index 1ecbbc0..39986df 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 24 22:44:55 UTC 2017 - meissner@suse.com
+
+- Updated to 2.0 final release
+
 -------------------------------------------------------------------
 Sat Jan 21 11:23:10 UTC 2017 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 4bc48b0..040b27f 100644
--- a/wine.spec
+++ b/wine.spec
@@ -54,8 +54,8 @@ BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
 BuildRequires:  pkgconfig(libudev)
-%define realver 2.0-rc6
-Version:        2.0~rc6
+%define realver 2.0
+Version:        2.0
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 225a4a0..2ca0051 100644
--- a/winetricks
+++ b/winetricks
@@ -5735,7 +5735,7 @@ load_directx9()
     w_override_dlls native d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37
     w_override_dlls native d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 d3dx9_43 d3dxof
     w_override_dlls native dciman32 ddrawex devenum dmband dmcompos dmime dmloader dmscript dmstyle
-    w_override_dlls native dmsynth dmusic dmusic32 dnsapi dplay dplayx dpnaddr dpnet dpnhpast dpnlobby
+    w_override_dlls native dmsynth dmusic dmusic32 dplay dplayx dpnaddr dpnet dpnhpast dpnlobby
     w_override_dlls native dswave dxdiagn msdmo qcap quartz streamci
     w_override_dlls native dxdiag.exe
     w_override_dlls builtin d3d8 d3d9 dinput dinput8 dsound
@@ -6263,8 +6263,6 @@ load_dotnet30()
 
     w_call dotnet20
 
-    w_warn "Installing .NET 3.0 runtime takes 3 minutes on a very fast machine, and the Finished dialog may hide in the taskbar."
-
     # AF's workaround to avoid long pause
     LANGPACKS_BASE_PATH="${W_WINDIR_UNIX}/SYSMSICache/Framework/v3.0"
     test -d "${LANGPACKS_BASE_PATH}" || mkdir -p "${LANGPACKS_BASE_PATH}"
@@ -6284,7 +6282,8 @@ load_dotnet30()
     WINEDLLOVERRIDES="ngen.exe,mscorsvw.exe=b;$WINEDLLOVERRIDES"
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
+    w_warn "Installing .NET 3.0 runtime silently, as otherwise it gets hidden behind taskbar. Installation usually takes about 3 minutes."
+    w_try "$WINE" "$file1" /q /c:"install.exe /q"
 
     # Doesn't install any ngen.exe
     # W_NGEN_CMD=""