From e7efaf230497389974fbb744466475c890012d96e637ff95a329146a495380b5 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 20 Nov 2015 13:53:56 +0000
Subject: [PATCH] - Updated to 1.8-rc1 codefreeze snapshot   - bugfixes only -
 winetricks updated

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=322
---
 wine-1.7.55.tar.bz2       |  3 ---
 wine-1.7.55.tar.bz2.sign  |  7 -------
 wine-1.8-rc1.tar.bz2      |  3 +++
 wine-1.8-rc1.tar.bz2.sign | 17 ++++++++++++++++
 wine.changes              |  7 +++++++
 wine.spec                 |  9 +++++----
 winetricks                | 41 ++++++++++++++++++++++++++++++++++++++-
 7 files changed, 72 insertions(+), 15 deletions(-)
 delete mode 100644 wine-1.7.55.tar.bz2
 delete mode 100644 wine-1.7.55.tar.bz2.sign
 create mode 100644 wine-1.8-rc1.tar.bz2
 create mode 100644 wine-1.8-rc1.tar.bz2.sign

diff --git a/wine-1.7.55.tar.bz2 b/wine-1.7.55.tar.bz2
deleted file mode 100644
index 753c0d7..0000000
--- a/wine-1.7.55.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a148f6c9cb45a75ef1a15e60a7db9c22fce985e0e58fe1350e7931dfe5d36119
-size 22814631
diff --git a/wine-1.7.55.tar.bz2.sign b/wine-1.7.55.tar.bz2.sign
deleted file mode 100644
index f044857..0000000
--- a/wine-1.7.55.tar.bz2.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlZF9LkACgkQ9ebp7rlGHdeovACfdaLFrZ8Rt6ogJ8XI2wo+FsgE
-eVMAoKsdoenGyQ+m3TboXJX5+5KlajRg
-=DBO8
------END PGP SIGNATURE-----
diff --git a/wine-1.8-rc1.tar.bz2 b/wine-1.8-rc1.tar.bz2
new file mode 100644
index 0000000..8c09d31
--- /dev/null
+++ b/wine-1.8-rc1.tar.bz2
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..4d42406
--- /dev/null
+++ b/wine-1.8-rc1.tar.bz2.sign
@@ -0,0 +1,17 @@
+-----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.changes b/wine.changes
index d2793cf..c6b718f 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 20 13:52:33 UTC 2015 - meissner@suse.com
+
+- Updated to 1.8-rc1 codefreeze snapshot
+  - bugfixes only
+- winetricks updated
+
 -------------------------------------------------------------------
 Fri Nov 13 14:50:20 UTC 2015 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 8ab578d..8001ddc 100644
--- a/wine.spec
+++ b/wine.spec
@@ -53,15 +53,16 @@ BuildRequires:  sane-backends-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
-Version:        1.7.55
+%define realver 1.8-rc1
+Version:        1.8~rc1
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
 Group:          System/Emulators/PC
 Url:            http://www.winehq.org/
-Source0:        http://downloads.sourceforge.net/project/wine/Source//wine-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/wine/Source/wine-%{realver}.tar.bz2
 Source41:       wine.keyring
-Source42:       http://downloads.sourceforge.net/project/wine/Source//%{name}-%{version}.tar.bz2.sign
+Source42:       http://downloads.sourceforge.net/project/wine/Source//%{name}-%{realver}.tar.bz2.sign
 Source1:        https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
 Source11:       https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.1
 Source2:        http://kegel.com/wine/wisotool
@@ -116,7 +117,7 @@ This RPM contains the header files and development tools for the WINE
 libraries.
 
 %prep
-%setup -q
+%setup -q -n wine-%{realver}
 #%patch0 -p1
 #
 cp %{S:3} .
diff --git a/winetricks b/winetricks
index eefd3da..21fd8ec 100644
--- a/winetricks
+++ b/winetricks
@@ -1399,7 +1399,7 @@ w_ahk_do()
     fi
 
     _W_CR=`printf \\\\r`
-    cat <<_EOF_ | sed "s/\$/$CR/" > "$W_TMP"/tmp.ahk
+    cat <<_EOF_ | sed "s/\$/$_W_CR/" > "$W_TMP"/tmp.ahk
 w_opt_unattended = ${W_OPT_UNATTENDED:-0}
 $@
 _EOF_
@@ -18735,6 +18735,42 @@ _EOF_
 
 #----------------------------------------------------------------
 
+w_metadata hidewineexports=enable settings \
+    title="Enable hiding wine exports from applications (wine-staging)"
+w_metadata hidewineexports=disable settings \
+    title="Disable hiding wine exports from applications (wine-staging)"
+
+load_hidewineexports()
+{
+    # Wine exports some functions allowing apps to query the wine version and
+    # information about the host environment. Using these functions, some apps
+    # will intentionally terminate if they can detect that they are running in
+    # a wine environment.
+    #
+    # Hiding these wine exports is only available in wine-staging.
+    # See https://bugs.winehq.org/show_bug.cgi?id=38656
+    case $arg in
+        enable)
+            local registry_value="\"Y\""
+            ;;
+        disable)
+            local registry_value="-"
+            ;;
+        *) w_die "Unexpected argument, $arg";;
+    esac
+
+    cat > "$W_TMP"/set-wineexports.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\Software\Wine]
+"HideWineExports"=$registry_value
+
+_EOF_
+    w_try_regedit "$W_TMP"/set-wineexports.reg
+}
+
+#----------------------------------------------------------------
+
 w_metadata hosts settings \
     title_uk="Додати порожні файли у C:\windows\system32\drivers\etc\{hosts,services}" \
     title="Add empty C:\windows\system32\drivers\etc\{hosts,services} files"
@@ -18874,6 +18910,9 @@ w_metadata sound=disabled settings \
 w_metadata sound=oss settings \
     title_uk="Поставити звуковий драйвер OSS" \
     title="Set sound driver to OSS"
+w_metadata sound=pulse settings \
+    title_uk="Поставити звуковий драйвер PulseAudio" \
+    title="Set sound driver to PulseAudio"
 
 load_sound()
 {