From 38ee3b4cc750452d1998c385f8c5818943064b1df962710820e80abdc55af39a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 20 Aug 2017 08:00:46 +0000
Subject: [PATCH] - Update to 2.15 development snapshot   - Support for AES
 encryption.   - Improved Bezier support in Direct2D.   - Chunked transfer
 improvements in WinInet.   - Various bug fixes. - updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=434
---
 wine-2.14.tar.xz      |  3 ---
 wine-2.14.tar.xz.sign | 16 ----------------
 wine-2.15.tar.xz      |  3 +++
 wine-2.15.tar.xz.sign | 16 ++++++++++++++++
 wine.changes          | 10 ++++++++++
 wine.spec             |  4 ++--
 winetricks            | 11 +++++++++--
 7 files changed, 40 insertions(+), 23 deletions(-)
 delete mode 100644 wine-2.14.tar.xz
 delete mode 100644 wine-2.14.tar.xz.sign
 create mode 100644 wine-2.15.tar.xz
 create mode 100644 wine-2.15.tar.xz.sign

diff --git a/wine-2.14.tar.xz b/wine-2.14.tar.xz
deleted file mode 100644
index 25b56b7..0000000
--- a/wine-2.14.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6
-size 19447812
diff --git a/wine-2.14.tar.xz.sign b/wine-2.14.tar.xz.sign
deleted file mode 100644
index aea7069..0000000
--- a/wine-2.14.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlmDYAMACgkQzvrI6q8X
-UZ0T8A/9EV5Cx0P3Hv7RBfYghDqG2jlI8EcUEKTl4kkZoLVfhQoChAFSX+yUNXDC
-O41vDX3XnYJ2M9OkKn5bePJs2GvGnQU0ENjzCz25jhuVMU1LG7m+Jf9FkYoekQhO
-l3w7irMagZQIGrdX/JSpFMa0KIDrOkhnSHwJJ3jxHsInJJoXAFqEzB4J1cMJ2Bpq
-jJLioJoKaE+FfbiJd8nmSxRwPCfb2AYJS7jPKimt7AF39MN1Fmijthf+dyvEZ8e8
-3PJ/XQTJkipOIJ2GX7pHr6TJENXzyXZQLjgrtLXyBVLz7D3FKBdG0FaLi9w7lMTT
-Mlcj8UDieWtI67aQQi4d+6pw9lOSTtkTIpQJK5sBfRV9qhIdpVi8U/4nGujux5NR
-c20dgfHJue5UdGJaQ2OAIfPJ+D73EfTQscwQ4fvK1yyWL+peWLjYgINvCoHBeb+9
-VWmBya2e4PeKZOXQee1GTkaWYnGXbqRz9IleuSgomFta81jH05L8mUTg4/8gt3ao
-E87eDcxSauAHh99P/9/viCCnUP3ZIMxS7WiD1PQRPtXxD30MeNHXmUxLn4WOcwWL
-RdCyM2EgIh7ecdmlgFSIWRaC/Fo8zydk0DkxihVkaGQHvXRrHv2wfNLesm000xYg
-ztoVzKTf7qhpR3IK3nB67FWa3pz+L5MTt7l5ZtZTvtIpFjL45OE=
-=hZMv
------END PGP SIGNATURE-----
diff --git a/wine-2.15.tar.xz b/wine-2.15.tar.xz
new file mode 100644
index 0000000..2f8408e
--- /dev/null
+++ b/wine-2.15.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3
+size 19463720
diff --git a/wine-2.15.tar.xz.sign b/wine-2.15.tar.xz.sign
new file mode 100644
index 0000000..dba3240
--- /dev/null
+++ b/wine-2.15.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlmZF4sACgkQzvrI6q8X
+UZ0ZOQ/9ETNLvxX9ZwpBL3mt/4aBSsDYe03eo92Ok+qos6XCgISRZfPDROaw6kha
+Wg7kNWzgUoVE5nr56McdIRyi6cLkxuYZbSsoGjpcI6uZ/LfFdJnxTIPUMLTIj3wL
+Jk2wSVv0mj7F48NwPqw1qoQF+zjPY3Xz9GGfYqNDvAXA/INT5OVDby0je+R0og5P
+KfVd97pZmQa79sth0XRA+XdZ/YVdTUsDsjTkxAqc5pVhc4gSKXhbtHIhidsd4U6f
+swo8ewYU6WmA53G5banxL1R8XC7LOEeeygbYnNDQUxZyl5TvHgESs1RdSeoBjpqF
+cD11rJvfDrFqe93A5raTaMEkBXRFtgOrZMI/o0ZyKhD36OICPCx7OQQO5z/n0YdE
+CUOQAbKBXUh6yVnXK35GYbL92PtIr5zbqpWVE1B0OkKA4Ck1ABlc3iGue136siND
+aLuw2HARGBPTy14Yac8bjNJ5QISlh/DXngoxrrjovYLBnbrdh9MfSkzAs7yodj3H
+wLcLov3N2EESBI24t2KAP+M7q9xq9VGbVnDmgdb0bcLa+F093Qs6dyxNXIfb7jx/
+CetY1aBgzB8sF6NofGtQQc4b4NEzeptKjPb5FGpiK/MK4HfnBTWtRTyQidf34IMP
+fB72ivQ/dtPNIsQk6D1qJoUmHFZseW8PHZj5PTNMcvMUw3NKADU=
+=92Er
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index 3588a98..f1458e9 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Aug 20 08:00:13 UTC 2017 - meissner@suse.com
+
+- Update to 2.15 development snapshot
+  - Support for AES encryption.
+  - Improved Bezier support in Direct2D.
+  - Chunked transfer improvements in WinInet.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Fri Aug  4 11:03:53 UTC 2017 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 38b2447..883a749 100644
--- a/wine.spec
+++ b/wine.spec
@@ -61,8 +61,8 @@ BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
 BuildRequires:  pkgconfig(libudev)
-%define realver 2.14
-Version:        2.14
+%define realver 2.15
+Version:        2.15
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 91ff916..36cf0ef 100644
--- a/winetricks
+++ b/winetricks
@@ -1779,7 +1779,7 @@ w_common_override_dll()
     module="$2"
 
     # Remove wine's builtin manifest, if present. Use:
-    # wineboot ; find "$WINEPREFIX"/drive_c/windows/winsxs/ -iname *manifest | grep deadbeef | sort
+    # wineboot ; find "$WINEPREFIX"/drive_c/windows/winsxs/ -iname \*deadbeef.manifest | sort
     case "$W_PACKAGE" in
         comctl32)
             w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest
@@ -5241,7 +5241,14 @@ load_adobeair()
     # 2017/03/14: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha256sum 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
     w_download https://airdownload.adobe.com/air/win/download/20.0/AdobeAIRInstaller.exe 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
     w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
+
+    # See https://bugs.winehq.org/show_bug.cgi?id=43506
+    # and https://github.com/Winetricks/winetricks/issues/821
+    if w_workaround_wine_bug 43506 "Forcing quiet install"; then
+        w_try "$WINE" AdobeAIRInstaller.exe -silent
+    else
+        w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
+    fi
 }
 
 #----------------------------------------------------------------