1.7.2-1

- version upgrade
- workaround for rhbz#968860
- upgraded winepulse

.gitignore

@@ -1,4 +1,4 @@
 /wine-1.6.tar.bz2.sign
 /wine-1.6.tar.bz2
-/wine-1.7.1.tar.bz2
+/wine-1.7.2.tar.bz2
-/wine-1.7.1.tar.bz2.sign
+/wine-1.7.2.tar.bz2.sign

sources

@@ -1,2 +1,2 @@
-3a3fae3e541ccaf1b891d89b5594ecc5  wine-1.7.1.tar.bz2
+17ece5f22c691bd6067c86f0dd68cfd7  wine-1.7.2.tar.bz2
-6bc7fe035e8968b32fa2a805a1e6320e  wine-1.7.1.tar.bz2.sign
+f88fbe903d2e7356a44eeb89e70d41ba  wine-1.7.2.tar.bz2.sign

wine-1.5.17-osmesa-check.patch

@@ -1,38 +0,0 @@
-From 1ede664b18bd8a88359a3cebb291ad49833ee033 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 7 Aug 2012 01:29:01 -0400
-Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
-
-If mesa had been built with shared glapi, glAccum is not available in
-libOSMesa without explicitly linking to libGL. In addition, in
-mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
-libglapi if mesa was built with shared glapi, see
-https://bugs.gentoo.org/show_bug.cgi?id=399813
-And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
-libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cc32c24..275b792 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1128,7 +1128,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
- 
-         if test "x$with_osmesa" != "xno"
-         then
--            WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+            WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+            if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
-+                osmesa_save_CC=$CC
-+                CC=$CXX
-+                WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+                CC=$osmesa_save_CC
-+            fi
-             WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
-                              [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
-         fi
--- 
-1.8.0
-

wine-pulse-winmm-Load-winealsa-if-winepulse-is-found.patch

@@ -1,29 +0,0 @@
-From 8f39a12639ee1d39c8caaf5f2ab72540d281814e Mon Sep 17 00:00:00 2001
-From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Date: Sat, 29 Dec 2012 01:02:30 +0100
-Subject: [PATCH] winmm: Load winealsa if winepulse is found
-
-Fixes midi on winepulse
----
- dlls/winmm/lolvldrv.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
-index f387323..3b1be27 100644
---- a/dlls/winmm/lolvldrv.c
-+++ b/dlls/winmm/lolvldrv.c
-@@ -543,7 +543,10 @@ static void MMDRV_Init(void)
-     drvA = HeapAlloc(GetProcessHeap(), 0, size);
-     WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL);
- 
--    MMDRV_Install(drvA, drvA, FALSE);
-+    if (!strcasecmp(drvA, "winepulse.drv"))
-+        MMDRV_Install("winealsa.drv", "winealsa.drv", 0);
-+    else
-+        MMDRV_Install(drvA, drvA, FALSE);
- 
-     HeapFree(GetProcessHeap(), 0, drvA);
-     PropVariantClear(&pv);
--- 
-1.6.5.GIT
-

wine.spec

@@ -3,8 +3,8 @@
 %global winemono  0.0.8
 
 Name:           wine
-Version:        1.7.1
+Version:        1.7.2
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
 Group:          Applications/Emulators
@@ -32,9 +32,6 @@ Source108:      wine-wordpad.desktop
 Source109:      wine-oleview.desktop
 
 # build fixes
-# do not check for glAccum
-# wget http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch?revision=1.1
-Patch1:          wine-1.5.17-osmesa-check.patch
 
 # wine bugs
 
@@ -56,16 +53,14 @@ Patch511:       wine-cjk.patch
 
 ## winepulse backend
 # http://repo.or.cz/w/wine/multimedia.git
-# Fri, 2 Aug 2013 21:19:49 +0000
+# Sat, 31 Aug 2013 06:36:03 +0000
-# configure
+# based on wine tree 1.7.1
-# configure.ac
+##
-# dlls/mmdevapi/main.c
+# git clone http://repo.or.cz/w/wine/multimedia.git
-# dlls/winepulse.drv
+# cd multimedia.git
-# 
+# git format-patch -k --stdout bea77093864177659aa16aab5d81b213015990b9~..eecbc197a50ddee696590019e8aa644108f3efb2 > ~/cvs/fedora/rpms/wine/wine-pulse-1.7.1.patch
-Patch1001:      wine-pulse-1.7.0.patch
+# git format-patch -k --stdout 8513286932d086a28eeab6652b81990b7cb3f36d~..5a091534be9dcb6cdfa8bdf9f4e642b42acd35de --stdout >> ~/cvs/fedora/rpms/wine/wine-pulse-1.7.1.patch
-# use winealsa for midi in the pa backend
+Patch1001:      wine-pulse-1.7.1.patch
-# http://repo.or.cz/w/wine/multimedia.git/commit/8f39a12639ee1d39c8caaf5f2ab72540d281814e
-Patch1002:      wine-pulse-winmm-Load-winealsa-if-winepulse-is-found.patch
 
 %if !%{?no64bit}
 ExclusiveArch:  %{ix86} x86_64 %{arm}
@@ -152,7 +147,8 @@ Requires:       wine-openal(x86-32) = %{version}-%{release}
 Requires:       mingw32-wine-gecko = %winegecko
 Requires:       wine-mono = %winemono
 %endif
-# Requires:       samba-winbind-clients(x86-32) wait for rhbz#968860
+#  wait for rhbz#968860 to require arch-specific samba-winbind-clients
+Requires:       /usr/bin/ntlm_auth
 Requires:       mesa-dri-drivers(x86-32)
 %endif
 
@@ -177,7 +173,6 @@ Requires:       wine-openal(x86-64) = %{version}-%{release}
 Requires:       mingw64-wine-gecko = %winegecko
 Requires:       wine-mono = %winemono
 %endif
-# Requires:       samba-winbind-clients(x86-64) wait for rhbz#968860
 Requires:       mesa-dri-drivers(x86-64)
 Requires:       wine-wow(x86-64) = %{version}-%{release}
 Conflicts:      wine-wow(x86-32) = %{version}-%{release}
@@ -536,12 +531,9 @@ This package adds an openal driver for wine.
 %prep
 %setup -q
 
-%patch1 -p1 -b.osmesa
-
 %patch511 -p1 -b.cjk
 
 %patch1001 -p1 -b.winepulse
-%patch1002 -p1 -b.winepulse-midi
 
 autoreconf
 
@@ -983,6 +975,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/atl.dll.so
 %{_libdir}/wine/atl80.dll.so
 %{_libdir}/wine/atl100.dll.so
+%{_libdir}/wine/atl110.dll.so
 %{_libdir}/wine/authz.dll.so
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
@@ -1016,6 +1009,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/d3drm.dll.so
 %{_libdir}/wine/d3dx9_*.dll.so
 %{_libdir}/wine/d3dx10_*.dll.so
+%{_libdir}/wine/d3dx11_42.dll.so
+%{_libdir}/wine/d3dx11_43.dll.so
 %{_libdir}/wine/d3dxof.dll.so
 %{_libdir}/wine/dbgeng.dll.so
 %{_libdir}/wine/dbghelp.dll.so
@@ -1170,6 +1165,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/msxml6.dll.so
 %{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
+%{_libdir}/wine/netcfgx.dll.so
 %{_libdir}/wine/netsh.exe.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/normaliz.dll.so
@@ -1314,6 +1310,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/xinput1_1.dll.so
 %{_libdir}/wine/xinput1_2.dll.so
 %{_libdir}/wine/xinput1_3.dll.so
+%{_libdir}/wine/xinput1_4.dll.so
 %{_libdir}/wine/xinput9_1_0.dll.so
 %{_libdir}/wine/xmllite.dll.so
 %{_libdir}/wine/xolehlp.dll.so
@@ -1558,6 +1555,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Sun Sep 15 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.7.2-1
+- version upgrade
+- workaround for rhbz#968860
+- upgraded winepulse
+
 * Sat Aug 31 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.7.1-2
 - fix icons with patch provided by Frank Dana (rhbz#997543)