- bug fixes/version upgrade

.cvsignore

@@ -1 +1 @@
-wine-0.9.49-fe.tar.bz2
+wine-0.9.51-fe.tar.bz2

README-FEDORA-PULSEAUDIO

@@ -0,0 +1,10 @@
+Wine and Pulseaudio Support
+---------------------------
+
+Currently wine does not have native support for pulseaudio. As a workaround to
+make wine work alongside pulseaudio select OSS sound output in winecfg. Wine
+then calls padsp as a wrapper if alsa-plugin-pulseaudio and pulseaudio-utils is
+installed. 
+
+If you think you have found a bug related to this take a look at the bug
+reporting procedure at http://fedoraproject.org/wiki/AndreasBierfert/Wine.

sources

@@ -1 +1 @@
-918c7f23585e08824dc7e14786deb441  wine-0.9.49-fe.tar.bz2
+a111b62c764559202c03c9076e983b9d  wine-0.9.51-fe.tar.bz2

wine-pulseaudio.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ -x /usr/lib*/alsa-lib/libasound_module_pcm_pulse.so ] && [ -x "/usr/bin/padsp" ] ; then
+    echo "Running padsp as pulseaudio wrapper for wine"
+    exec padsp -- /usr/bin/wine_bin "$@"
+else
+    exec /usr/bin/wine_bin "$@"
+fi

wine.spec

@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.49
+Version:	0.9.51
 Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -18,7 +18,7 @@ URL:		http://www.winehq.org/
 # Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
 # programs/winecfg/libraries.c:    "winemp3.acm",
 
-Source0:        wine-0.9.49-fe.tar.bz2
+Source0:        wine-0.9.51-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -43,6 +43,11 @@ Source300:      wine-mime-msi.desktop
 Source400:      wineshelllink-fedora
 Patch400:       wine-wineshelllink.patch
 
+# fix for pulseaudio playback (#344281)
+Source401:      wine-pulseaudio.sh
+Source402:      README-FEDORA-PULSEAUDIO
+
+
 Patch0:         wine-prefixfonts.patch
 Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -145,6 +150,7 @@ ESD sound support for wine
 Summary: JACK sound support for wine
 Group: System Environment/Libraries
 Requires: wine-core = %{version}-%{release}
+Requires: jack-audio-connection-kit
 
 %description jack
 JACK sound support for wine
@@ -299,6 +305,12 @@ install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
 install -p -m755 %{SOURCE400} $RPM_BUILD_ROOT%{_bindir}/wineshelllink-fedora
 
+
+# pulseaudio workaround (#344281)
+mv $RPM_BUILD_ROOT%{_bindir}/{wine,wine_bin}
+install -pm755 %{SOURCE401} $RPM_BUILD_ROOT%{_bindir}/wine
+cp %{SOURCE402} .
+
 %clean
 rm -rf %{buildroot}
 
@@ -351,10 +363,13 @@ update-desktop-database &>/dev/null || :
 %doc AUTHORS README-Fedora README VERSION
 # do not include huge changelogs .OLD .ALPHA (#204302)
 %doc documentation/README.*
+# pulseaudio workaround documentation
+%doc README-FEDORA-PULSEAUDIO
 %{_bindir}/msiexec
 %{_bindir}/regedit
 %{_bindir}/regsvr32
 %{_bindir}/wine
+%{_bindir}/wine_bin
 %{_bindir}/wineboot
 %{_bindir}/winebrowser
 %{_bindir}/wineconsole
@@ -405,6 +420,7 @@ update-desktop-database &>/dev/null || :
 %dir %{_libdir}/wine
 %{_libdir}/wine/acledit.dll.so
 %{_libdir}/wine/activeds.dll.so
+%{_libdir}/wine/actxprxy.dll.so
 %{_libdir}/wine/advapi32.dll.so
 %{_libdir}/wine/advpack.dll.so
 %{_libdir}/wine/amstream.dll.so
@@ -572,6 +588,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/pstorec.dll.so
 %{_libdir}/wine/qcap.dll.so
 %{_libdir}/wine/qmgr.dll.so
+%{_libdir}/wine/qmgrprxy.dll.so
 %{_libdir}/wine/quartz.dll.so
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
@@ -603,6 +620,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/sti.dll.so
 %{_libdir}/wine/storage.dll16
 %{_libdir}/wine/stress.dll16
+%{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/svrapi.dll.so
 %{_libdir}/wine/sxs.dll.so
 %{_libdir}/wine/system.drv16
@@ -757,6 +775,7 @@ update-desktop-database &>/dev/null || :
 %{_mandir}/man1/wrc.1*
 %{_mandir}/man1/winedbg.1*
 %{_mandir}/man1/wineg++.1*
+%lang(de) %{_mandir}/de.UTF-8/man1/wine.1*
 %{_datadir}/aclocal/wine.m4
 %attr(0755, root, root) %dir %{_includedir}/wine
 %{_includedir}/wine/*
@@ -764,6 +783,19 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Dec 28 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.51-2
+- add fix for #344281 pulseaudio workaround
+- fix #253474: wine-jack should require jack-audio-connection-kit
+
+* Sun Dec 16 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.51-1
+- version upgrade
+
+* Sat Dec 01 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.50-1
+- version upgrade
+
 * Sun Dec 09 2007 Alex Lancaster <alexlan [AT] fedoraproject.org> 
 - 0.9.49-2
 - Rebuild for new openssl/openldap soname bump