Sat Jun 19 08:23:32 UTC 2010

Author: awjb

Update of /cvs/pkgs/rpms/wine/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7748/EL-6

Modified Files:
	.cvsignore sources wine-notepad.desktop wine-oleview.desktop 
	wine-regedit.desktop wine-rpath.patch wine-uninstaller.desktop 
	wine-wineboot.desktop wine-winecfg.desktop 
	wine-winefile.desktop wine-winemine.desktop 
	wine-winhelp.desktop wine-wordpad.desktop wine.spec 
	winepulse-0.35-configure.ac.patch 
Added Files:
	wine-fonts.patch wine-gecko.patch wine-imagemagick-6.5.patch 
	winepulse-0.36.patch winepulse-0.37-winecfg.patch 
Removed Files:
	wine-x86_64-prefix.patch winepulse-0.34-winecfg.patch 
	winepulse-0.35.patch 
Log Message:
- 1.2 rc4
- fix requires for -common


wine-fonts.patch:
 dlls/gdi32/freetype.c |   40 ++++++++++++++++++++--------------------
 tools/wine.inf.in     |    3 ++-
 2 files changed, 22 insertions(+), 21 deletions(-)

--- NEW FILE wine-fonts.patch ---
--- dlls/gdi32/freetype.c.orig	2010-05-19 22:02:43.000000000 +0200
+++ dlls/gdi32/freetype.c	2010-05-19 23:57:27.000000000 +0200
@@ -400,7 +400,7 @@
 /* Interesting and well-known (frequently-assumed!) font names */
 static const WCHAR Lucida_Sans_Unicode[] = {'L','u','c','i','d','a',' ','S','a','n','s',' ','U','n','i','c','o','d','e',0};
 static const WCHAR Microsoft_Sans_Serif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0 };
-static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0};
+static const WCHAR Liberation[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0};
 static const WCHAR MS_UI_Gothic[] = {'M','S',' ','U','I',' ','G','o','t','h','i','c',0};
 static const WCHAR SimSun[] = {'S','i','m','S','u','n',0};
 static const WCHAR Gulim[] = {'G','u','l','i','m',0};
@@ -1641,7 +1641,7 @@
     WCHAR *entry, *next;
     SYSTEM_LINKS *font_link, *system_font_link;
     CHILD_FONT *child_font;
-    static const WCHAR tahoma_ttf[] = {'t','a','h','o','m','a','.','t','t','f',0};
+    static const WCHAR liberation_ttf[] = {'L','i','b','e','r','a','t','i','o','n','S','a','n','s','-','R','e','g','u','l','a','r','.','t','t','f',0};
     static const WCHAR System[] = {'S','y','s','t','e','m',0};
     FONTSIGNATURE fs;
     Family *family;
@@ -1723,25 +1723,25 @@
         RegCloseKey(hkey);
     }
 
-    /* Explicitly add an entry for the system font, this links to Tahoma and any links
-       that Tahoma has */
+    /* Explicitly add an entry for the system font, this links to Liberation Sans and any links
+       that Liberation Sans has */
 
     system_font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*system_font_link));
     system_font_link->font_name = strdupW(System);
     list_init(&system_font_link->links);    
 
-    face = find_face_from_filename(tahoma_ttf, Tahoma);
+    face = find_face_from_filename(liberation_ttf, Liberation);
     if(face)
     {
         child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font));
         child_font->face = face;
         child_font->font = NULL;
-        TRACE("Found Tahoma in %s index %ld\n", child_font->face->file, child_font->face->face_index);
+        TRACE("Found Liberation Sans in %s index %ld\n", child_font->face->file, child_font->face->face_index);
         list_add_tail(&system_font_link->links, &child_font->entry);
     }
     LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry)
     {
-        if(!strcmpiW(font_link->font_name, Tahoma))
+        if(!strcmpiW(font_link->font_name, Liberation))
         {
             CHILD_FONT *font_link_entry;
             LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry)
@@ -2193,21 +2193,21 @@
     /* Latin 1 (United States) */
     { 1252, 437, "vgaoem.fon", "vgafix.fon", "vgasys.fon",
       "coure.fon", "serife.fon", "smalle.fon", "sserife.fon",
-      "Tahoma","Times New Roman",
+      "Liberation Sans","Times New Roman",
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       { 0 }, { 0 }, { 0 }
     },
     /* Latin 1 (Multilingual) */
     { 1252, 850, "vga850.fon", "vgafix.fon", "vgasys.fon",
       "coure.fon", "serife.fon", "smalle.fon", "sserife.fon",
-      "Tahoma","Times New Roman",  /* FIXME unverified */
+      "Liberation Sans","Times New Roman",  /* FIXME unverified */
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       { 0 }, { 0 }, { 0 }
     },
     /* Eastern Europe */
     { 1250, 852, "vga852.fon", "vgafixe.fon", "vgasyse.fon",
       "couree.fon", "serifee.fon", "smallee.fon", "sserifee.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       "Fixedsys,238", "System,238",
       "Courier New,238", "MS Serif,238", "Small Fonts,238",
       "MS Sans Serif,238", "MS Sans Serif,238", "MS Serif,238",
@@ -2218,7 +2218,7 @@
     /* Cyrillic */
     { 1251, 866, "vga866.fon", "vgafixr.fon", "vgasysr.fon",
       "courer.fon", "serifer.fon", "smaller.fon", "sserifer.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       "Fixedsys,204", "System,204",
       "Courier New,204", "MS Serif,204", "Small Fonts,204",
       "MS Sans Serif,204", "MS Sans Serif,204", "MS Serif,204",
@@ -2229,7 +2229,7 @@
     /* Greek */
     { 1253, 737, "vga869.fon", "vgafixg.fon", "vgasysg.fon",
       "coureg.fon", "serifeg.fon", "smalleg.fon", "sserifeg.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       "Fixedsys,161", "System,161",
       "Courier New,161", "MS Serif,161", "Small Fonts,161",
       "MS Sans Serif,161", "MS Sans Serif,161", "MS Serif,161",
@@ -2240,7 +2240,7 @@
     /* Turkish */
     { 1254, 857, "vga857.fon", "vgafixt.fon", "vgasyst.fon",
       "couret.fon", "serifet.fon", "smallet.fon", "sserifet.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       "Fixedsys,162", "System,162",
       "Courier New,162", "MS Serif,162", "Small Fonts,162",
       "MS Sans Serif,162", "MS Sans Serif,162", "MS Serif,162",
@@ -2251,7 +2251,7 @@
     /* Hebrew */
     { 1255, 862, "vgaoem.fon", "vgaf1255.fon", "vgas1255.fon",
       "coue1255.fon", "sere1255.fon", "smae1255.fon", "ssee1255.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       "Fixedsys,177", "System,177",
       "Courier New,177", "MS Serif,177", "Small Fonts,177",
       "MS Sans Serif,177", "MS Sans Serif,177", "MS Serif,177",
@@ -2260,7 +2260,7 @@
     /* Arabic */
     { 1256, 720, "vgaoem.fon", "vgaf1256.fon", "vgas1256.fon",
       "coue1256.fon", "sere1256.fon", "smae1256.fon", "ssee1256.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       "Fixedsys,178", "System,178",
       "Courier New,178", "MS Serif,178", "Small Fonts,178",
       "MS Sans Serif,178", "MS Sans Serif,178", "MS Serif,178",
@@ -2269,7 +2269,7 @@
     /* Baltic */
     { 1257, 775, "vga775.fon", "vgaf1257.fon", "vgas1257.fon",
       "coue1257.fon", "sere1257.fon", "smae1257.fon", "ssee1257.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       "Fixedsys,186", "System,186",
       "Courier New,186", "MS Serif,186", "Small Fonts,186",
       "MS Sans Serif,186", "MS Sans Serif,186", "MS Serif,186",
@@ -2280,14 +2280,14 @@
     /* Vietnamese */
     { 1258, 1258, "vga850.fon", "vgafix.fon", "vgasys.fon",
       "coure.fon", "serife.fon", "smalle.fon", "sserife.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       { 0 }, { 0 }, { 0 }
     },
     /* Thai */
     { 874, 874, "vga850.fon", "vgaf874.fon", "vgas874.fon",
       "coure.fon", "serife.fon", "smalle.fon", "ssee874.fon",
-      "Tahoma","Times New Roman", /* FIXME unverified */
+      "Liberation Sans","Times New Roman", /* FIXME unverified */
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       { 0 }, { 0 }, { 0 }
     },
@@ -2325,7 +2325,7 @@
 {
     Lucida_Sans_Unicode,
     Microsoft_Sans_Serif,
-    Tahoma
+    Liberation
 };
 
 static const struct font_links_defaults_list
@@ -2337,7 +2337,7 @@
 } font_links_defaults_list[] =
 {
     /* Non East-Asian */
-    { Tahoma, /* FIXME unverified ordering */
+    { Liberation, /* FIXME unverified ordering */
       { MS_UI_Gothic, SimSun, Gulim, PMingLiU, NULL }
     },
     /* Below lists are courtesy of
--- tools/wine.inf.in.orig	2010-05-26 07:41:44.000000000 +0200
+++ tools/wine.inf.in	2010-05-26 07:46:15.000000000 +0200
@@ -576,13 +576,14 @@
 HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162"
 HKLM,%FontSubStr%,"Helv",,"MS Sans Serif"
 HKLM,%FontSubStr%,"Helvetica",,"Arial"
-HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma"
+HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Liberation Sans"
 HKLM,%FontSubStr%,"Times",,"Times New Roman"
 HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186"
 HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238"
 HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204"
 HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161"
 HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162"
+HKLM,%FontSubStr%,"MS Sans Serif",,"Liberation Serif"
 HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060
 
 [MCI]

wine-gecko.patch:
 Makefile.in |    2 -
 install.c   |  100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 100 insertions(+), 2 deletions(-)

--- NEW FILE wine-gecko.patch ---
--- dlls/mshtml/install.c.orig	2010-03-28 23:48:50.000000000 +0200
+++ dlls/mshtml/install.c	2010-03-29 20:43:54.000000000 +0200
@@ -284,6 +284,103 @@
     return ret;
 }
 
+static BOOL install_from_fedora_mingw32_wine_gecko(void) {
+    const char *data_dir, *subdir;
+    BOOL res;
+
+    LPWSTR dos_dir_name;
+    LPSTR dos_dir_name_a;
+    static WCHAR *(*wine_get_dos_file_name)(const char*);
+    static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
+
+    char install_dir[MAX_PATH];
+    char gecko_dir[MAX_PATH];
+
+    SHFILEOPSTRUCTA sf;
+
+    TRACE("()\n");
+
+    if((data_dir = wine_get_data_dir()))
+        subdir = "/gecko/";
+    else if((data_dir = wine_get_build_dir()))
+        subdir = "/../gecko/";
+    else
+        return FALSE;
+
+    TRACE("data_dir=%s\n",data_dir);
+    TRACE("subdir=%s\n",subdir);
+
+    memcpy(gecko_dir, data_dir, MAX_PATH);
+    strncat(gecko_dir, subdir, MAX_PATH-strlen(gecko_dir));
+    strncat(gecko_dir, GECKO_VERSION, MAX_PATH-strlen(gecko_dir));
+    strncat(gecko_dir, "/", MAX_PATH-strlen(gecko_dir));
+
+    if(!wine_get_dos_file_name)
+        wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name");
+
+    if(wine_get_dos_file_name) { /* Wine UNIX mode */
+        dos_dir_name = wine_get_dos_file_name(gecko_dir);
+        if(!dos_dir_name) {
+            ERR("Could not get dos file name of %s\n", debugstr_a(gecko_dir));
+            return FALSE;
+        }
+    } else {
+        return FALSE;
+    }
+
+    TRACE("gecko_dir=%s\n", debugstr_a(gecko_dir));
+    TRACE("dos_dir_name=%s\n", debugstr_w(dos_dir_name));
+
+
+    if(GetFileAttributesW(dos_dir_name) == INVALID_FILE_ATTRIBUTES) {
+        TRACE("mingw32-wine-gecko package not installed\n");
+        return FALSE;
+    }
+
+    GetSystemDirectoryA(install_dir, sizeof(install_dir));
+    strncat(install_dir, "\\gecko\\",MAX_PATH-strlen(install_dir));
+    res = CreateDirectoryA(install_dir, NULL);
+    if(!res && GetLastError() != ERROR_ALREADY_EXISTS) {
+        ERR("Could not create directory: %08u\n", GetLastError());
+        return FALSE;
+    }
+
+    strncat(install_dir, GECKO_VERSION, MAX_PATH-strlen(install_dir));
+    res = CreateDirectoryA(install_dir, NULL);
+    if(!res && GetLastError() != ERROR_ALREADY_EXISTS) {
+        ERR("Could not create directory: %08u\n", GetLastError());
+        return FALSE;
+    }
+
+    TRACE("install_dir=%s\n",debugstr_a(install_dir));
+
+    dos_dir_name_a = heap_strdupWtoA(dos_dir_name);
+
+    lstrcatA(dos_dir_name_a,"*.*");
+    TRACE("dos_dir_name_a=%s\n",debugstr_a(dos_dir_name_a));
+
+    memset(&sf,0,sizeof(sf));
+    sf.hwnd = 0;
+    sf.wFunc = FO_COPY;
+    sf.pFrom = dos_dir_name_a;
+    sf.pTo = install_dir;
+    sf.fFlags = FOF_NOCONFIRMATION, FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_SILENT;
+    res = SHFileOperationA(&sf);
+
+    heap_free(dos_dir_name_a);
+
+    if(res != 0) {
+        ERR("Could not copy files: %08u\n", GetLastError());
+        return FALSE;
+    }
+
+    set_registry(install_dir);
+
+    clean_up();
+
+    return TRUE;
+}
+
 static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface,
                                                      REFIID riid, void **ppv)
 {
@@ -541,7 +638,8 @@
          * - $datadir/gecko
          * - download from URL stored in GeckoUrl value of HKCU/Software/MSHTML key
          */
-        if(!install_from_registered_dir()
+        if ( !install_from_fedora_mingw32_wine_gecko()
+           && !install_from_registered_dir()
            && !install_from_default_dir()
            && !silent && (url = get_url()))
             DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc);
--- dlls/mshtml/Makefile.in.orig	2010-03-29 15:13:47.000000000 +0200
+++ dlls/mshtml/Makefile.in	2010-03-29 15:49:55.000000000 +0200
@@ -4,7 +4,7 @@
 VPATH     = @srcdir@
 MODULE    = mshtml.dll
 IMPORTLIB = mshtml
-IMPORTS   = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32
+IMPORTS   = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 shell32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 DELAYIMPORTS = wininet
 

wine-imagemagick-6.5.patch:
 configure    |    4 ++--
 configure.ac |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE wine-imagemagick-6.5.patch ---
--- configure.orig	2010-05-25 19:44:56.000000000 +0200
+++ configure	2010-05-25 19:46:11.000000000 +0200
@@ -5132,10 +5132,10 @@
     then
       convert_version_major=`expr "$convert_version" : '.* $[0-9]*$\.[0-9]*'`
       convert_version_minor=`expr "$convert_version" : '.* [0-9]*\.$[0-9]*$'`
-      if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6
+      if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 5
       then
         CONVERT=false
-        as_fn_append wine_warnings "|imagemagick version 6.6 or newer is needed to rebuild icons."
+        as_fn_append wine_warnings "|imagemagick version 6.5 or newer is needed to rebuild icons."
       fi
     fi
     if test "$CONVERT" = false
--- configure.ac.orig	2010-05-25 19:45:16.000000000 +0200
+++ configure.ac	2010-05-25 19:46:44.000000000 +0200
@@ -303,10 +303,10 @@
     then
       convert_version_major=`expr "$convert_version" : '.* $[[0-9]]*$\.[[0-9]]*'`
       convert_version_minor=`expr "$convert_version" : '.* [[0-9]]*\.$[[0-9]]*$'`
-      if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6
+      if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 5
       then
         CONVERT=false
-        WINE_WARNING([imagemagick version 6.6 or newer is needed to rebuild icons.])
+        WINE_WARNING([imagemagick version 6.5 or newer is needed to rebuild icons.])
       fi
     fi
     if test "$CONVERT" = false

winepulse-0.36.patch:
 Makefile.in        |   14 
 pulse.c            |  805 +++++++++++++++++++++++++++++++++++++++++
 wavein.c           |  588 ++++++++++++++++++++++++++++++
 waveout.c          | 1024 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  197 ++++++++++
 6 files changed, 2631 insertions(+)

--- NEW FILE winepulse-0.36.patch ---

diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..ed48381
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winepulse.drv
+IMPORTS   = winmm user32 kernel32
+EXTRALIBS = @PULSELIBS@
+EXTRACFLAGS = @PULSEINCL@
+
+C_SRCS = waveout.c \
+         wavein.c \
+         pulse.c
+
+ at MAKE_DLL_RULES@
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
new file mode 100644
index 0000000..9dd1f80
--- /dev/null
+++ b/dlls/winepulse.drv/pulse.c
@@ -0,0 +1,805 @@
+/*
+ * Wine Driver for PulseAudio
+ * http://pulseaudio.org/
+ *
+ * Copyright    2009 Arthur Taylor <theycallhimart at gmail.com>
+ *
+ * Contains code from other wine sound drivers.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "mmddk.h"
+#include "ks.h"
+#include "ksguid.h"
+#include "ksmedia.h"
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <poll.h>
+
+#ifdef HAVE_PULSEAUDIO
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/library.h"
+
+#include <winepulse.h>
+#include <pulse/pulseaudio.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wave);
+
+/* These strings used only for tracing */
+const char * PULSE_getCmdString(enum win_wm_message msg) {
+    static char unknown[32];
+#define MSG_TO_STR(x) case x: return #x
+    switch(msg) {
+    MSG_TO_STR(WINE_WM_PAUSING);
+    MSG_TO_STR(WINE_WM_RESTARTING);
+    MSG_TO_STR(WINE_WM_RESETTING);
+    MSG_TO_STR(WINE_WM_HEADER);
+    MSG_TO_STR(WINE_WM_BREAKLOOP);
+    MSG_TO_STR(WINE_WM_CLOSING);
+    MSG_TO_STR(WINE_WM_STARTING);
+    MSG_TO_STR(WINE_WM_STOPPING);
+    MSG_TO_STR(WINE_WM_XRUN);
+    MSG_TO_STR(WINE_WM_FEED);
+    }
+#undef MSG_TO_STR
+    sprintf(unknown, "UNKNOWN(0x%08x)", msg);
+    return unknown;
+}
+
+/*======================================================================*
+ *          Ring Buffer Functions - copied from winealsa.drv            *
+ *======================================================================*/
+
+/* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */
+#define USE_PIPE_SYNC
+
+#ifdef USE_PIPE_SYNC
+#define INIT_OMR(omr) do { if (pipe(omr->msg_pipe) < 0) { omr->msg_pipe[0] = omr->msg_pipe[1] = -1; } } while (0)
+#define CLOSE_OMR(omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0)
+#define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0)
+#define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0)
+#define RESET_OMR(omr) do { } while (0)
+#define WAIT_OMR(omr, sleep) \
+  do { struct pollfd pfd; pfd.fd = (omr)->msg_pipe[0]; \
+       pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0)
+#else
+#define INIT_OMR(omr) do { omr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); } while (0)
+#define CLOSE_OMR(omr) do { CloseHandle(omr->msg_event); } while (0)
+#define SIGNAL_OMR(omr) do { SetEvent((omr)->msg_event); } while (0)
+#define CLEAR_OMR(omr) do { } while (0)
+#define RESET_OMR(omr) do { ResetEvent((omr)->msg_event); } while (0)
+#define WAIT_OMR(omr, sleep) \
+  do { WaitForSingleObject((omr)->msg_event, sleep); } while (0)
+#endif
+
+#define PULSE_RING_BUFFER_INCREMENT      64
+
+/******************************************************************
+ *                  PULSE_InitRingMessage
+ *
+ * Initialize the ring of messages for passing between driver's caller
+ * and playback/record thread
+ */
+int PULSE_InitRingMessage(PULSE_MSG_RING* omr)
+{
+    omr->msg_toget = 0;
+    omr->msg_tosave = 0;
+    INIT_OMR(omr);
+    omr->ring_buffer_size = PULSE_RING_BUFFER_INCREMENT;
+    omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(PULSE_MSG));
+
+    InitializeCriticalSection(&omr->msg_crst);
+    omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PULSE_MSG_RING.msg_crst");
+    return 0;
+}
+
+/******************************************************************
+ *                  PULSE_DestroyRingMessage
+ *
+ */
+int PULSE_DestroyRingMessage(PULSE_MSG_RING* omr)
+{
+    CLOSE_OMR(omr);
+    HeapFree(GetProcessHeap(),0,omr->messages);
+    omr->messages = NULL;
+    omr->ring_buffer_size = PULSE_RING_BUFFER_INCREMENT;
+    omr->msg_crst.DebugInfo->Spare[0] = 0;
+    DeleteCriticalSection(&omr->msg_crst);
+    return 0;
+}
+/******************************************************************
+ *                  PULSE_ResetRingMessage
+ *
+ */
+void PULSE_ResetRingMessage(PULSE_MSG_RING* omr)
+{
+    RESET_OMR(omr);
+}
+
+/******************************************************************
+ *                  PULSE_WaitRingMessage
+ *
+ */
+void PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep)
+{
+    WAIT_OMR(omr, sleep);
+}
+
+/******************************************************************
+ *                  PULSE_AddRingMessage
+ *
+ * Inserts a new message into the ring (should be called from DriverProc derived routines)
+ */
+int PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait)
+{
+    HANDLE      hEvent = INVALID_HANDLE_VALUE;
+
+    EnterCriticalSection(&omr->msg_crst);
+    if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)))
+    {
+        int old_ring_buffer_size = omr->ring_buffer_size;
+        omr->ring_buffer_size += PULSE_RING_BUFFER_INCREMENT;
+        omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(PULSE_MSG));
+        /* Now we need to rearrange the ring buffer so that the new
+           buffers just allocated are in between omr->msg_tosave and
+           omr->msg_toget.
+        */
+        if (omr->msg_tosave < omr->msg_toget)
[...2268 lines suppressed...]
--- /dev/null
+++ b/dlls/winepulse.drv/winepulse.h
@@ -0,0 +1,197 @@
+/* Definitions for PulseAudio Wine Driver
+ *
+ * Copyright    2009 Arthur Taylor <theycallhimart at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
+#if defined(HAVE_PULSEAUDIO) && !defined(__WINEPULSE_H)
+#define __WINEPULSE_H
+
+#include "mmreg.h"
+#include "dsound.h"
+#include "dsdriver.h"
+
+#include "ks.h"
+#include "ksmedia.h"
+#include "ksguid.h"
+
+#include <pulse/pulseaudio.h>
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * |  state  |  function   |     event     |            new state            |
+ * +---------+-------------+---------------+---------------------------------+
+ * |         | open()      |               | STOPPED                         |
+ * | PAUSED  | write()     |               | PAUSED                          |
+ * | STOPPED | write()     | <thrd create> | PLAYING                         |
+ * | PLAYING | write()     | HEADER        | PLAYING                         |
+ * | (other) | write()     | <error>       |                                 |
+ * | (any)   | pause()     | PAUSING       | PAUSED                          |
+ * | PAUSED  | restart()   | RESTARTING    | PLAYING (if no thrd => STOPPED) |
+ * | (any)   | reset()     | RESETTING     | STOPPED                         |
+ * | (any)   | close()     | CLOSING       | CLOSED                          |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING         1
+#define WINE_WS_PAUSED          2
+#define WINE_WS_STOPPED         3
+#define WINE_WS_CLOSED          4
+#define WINE_WS_FAILED          5
+
+#define PULSE_ALL_FORMATS \
+        WAVE_FORMAT_1M08 |      /* Mono     11025Hz 8-bit  */\
+        WAVE_FORMAT_1M16 |      /* Mono     11025Hz 16-bit */\
+        WAVE_FORMAT_1S08 |      /* Stereo   11025Hz 8-bit  */\
+        WAVE_FORMAT_1S16 |      /* Stereo   11025Hz 16-bit */\
+        WAVE_FORMAT_2M08 |      /* Mono     22050Hz 8-bit  */\
+        WAVE_FORMAT_2M16 |      /* Mono     22050Hz 16-bit */\
+        WAVE_FORMAT_2S08 |      /* Stereo   22050Hz 8-bit  */\
+        WAVE_FORMAT_2S16 |      /* Stereo   22050Hz 16-bit */\
+        WAVE_FORMAT_4M08 |      /* Mono     44100Hz 8-bit  */\
+        WAVE_FORMAT_4M16 |      /* Mono     44100Hz 16-bit */\
+        WAVE_FORMAT_4S08 |      /* Stereo   44100Hz 8-bit  */\
+        WAVE_FORMAT_4S16 |      /* Stereo   44100Hz 16-bit */\
+        WAVE_FORMAT_48M08 |     /* Mono     48000Hz 8-bit  */\
+        WAVE_FORMAT_48S08 |     /* Stereo   48000Hz 8-bit  */\
+        WAVE_FORMAT_48M16 |     /* Mono     48000Hz 16-bit */\
+        WAVE_FORMAT_48S16 |     /* Stereo   48000Hz 16-bit */\
+        WAVE_FORMAT_96M08 |     /* Mono     96000Hz 8-bit  */\
+        WAVE_FORMAT_96S08 |     /* Stereo   96000Hz 8-bit  */\
+        WAVE_FORMAT_96M16 |     /* Mono     96000Hz 16-bit */\
+        WAVE_FORMAT_96S16       /* Stereo   96000Hz 16-bit */
+
+/* events to be sent to device */
+enum win_wm_message {
+    WINE_WM_PAUSING = WM_USER + 1, WINE_WM_RESTARTING, WINE_WM_RESETTING, WINE_WM_HEADER,
+    WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING, WINE_WM_XRUN, WINE_WM_FEED
+};
+
+typedef struct {
+    enum win_wm_message msg;    /* message identifier */
+    DWORD               param;  /* parameter for this message */
+    HANDLE              hEvent; /* if message is synchronous, handle of event for synchro */
+} PULSE_MSG;
+
+/* implement an in-process message ring for better performance
+ * (compared to passing thru the server)
+ * this ring will be used by the input (resp output) record (resp playback) routine
+ */
+typedef struct {
+    PULSE_MSG                   * messages;
+    int                         ring_buffer_size;
+    int                         msg_tosave;
+    int                         msg_toget;
+/* Either pipe or event is used, but that is defined in pulse.c,
+ * since this is a global header we define both here */
+    int                         msg_pipe[2];
+    HANDLE                      msg_event;
+    CRITICAL_SECTION            msg_crst;
+} PULSE_MSG_RING;
+
+typedef struct WINE_WAVEDEV WINE_WAVEDEV;
+typedef struct WINE_WAVEINST WINE_WAVEINST;
+
+/* Per-playback/record device */
+struct WINE_WAVEDEV {
+    char                interface_name[MAXPNAMELEN * 2];
+    char                *device_name;
+    pa_cvolume          volume;
+
+    union {
+        WAVEOUTCAPSW    out;
+        WAVEINCAPSW     in;
+    } caps;
+    
+    /* DirectSound stuff */
+    DSDRIVERDESC                ds_desc;
+    DSDRIVERCAPS                ds_caps;
+};
+
+/* Per-playback/record instance */
+struct WINE_WAVEINST {
+    INT                 state;              /* one of the WINE_WS_ manifest constants */
+    WAVEOPENDESC        waveDesc;
+    WORD                wFlags;
+
+    /* PulseAudio specific data */
+    pa_stream           *stream;            /* The PulseAudio stream */
+    const pa_timing_info *timing_info;      /* The timing info structure for the stream */
+    pa_sample_spec      sample_spec;        /* Sample spec of this stream / device */
+    pa_cvolume          volume;             /* Software volume of the stream */
+    pa_buffer_attr      buffer_attr;        /* Buffer attribute, may not be used */
+
+    /* waveIn / waveOut wavaHdr */
+    LPWAVEHDR           lpQueuePtr;         /* Start of queued WAVEHDRs (waiting to be notified) */
+    LPWAVEHDR           lpPlayPtr;          /* Start of not yet fully written buffers */
+    DWORD               dwPartialOffset;    /* Offset of not yet written bytes in lpPlayPtr */
+    LPWAVEHDR           lpLoopPtr;          /* Pointer of first buffer in loop, if any */
+    DWORD               dwLoops;            /* Private copy of loop counter */
+    DWORD               dwLastReset;        /* When the last reset occured, as pa stream time doesn't reset */
+
+    /* waveIn specific */
+    const void          *buffer;            /* Pointer to the latest data fragment for recording streams */
+    DWORD               buffer_length;      /* How large the latest data fragment is */
+    DWORD               buffer_read_offset; /* How far into latest data fragment we last read */
+
+    /* Thread communication and synchronization stuff */
+    HANDLE              hStartUpEvent;
+    HANDLE              hThread;
+    DWORD               dwThreadID;
+    PULSE_MSG_RING      msgRing;
+};
+
+/* We establish one context per instance, so make it global to the lib */
+pa_context              *PULSE_context;   /* Connection Context */
+pa_threaded_mainloop    *PULSE_ml;        /* PA Runtime information */
+
+/* WaveIn / WaveOut devices */
+WINE_WAVEDEV *WOutDev;
+WINE_WAVEDEV *WInDev;
+DWORD PULSE_WodNumDevs;
+DWORD PULSE_WidNumDevs;
+
+/* pulse.c: PulseAudio Async Callbacks */
+void    PULSE_StreamRequestCallback(pa_stream *s, size_t nbytes, void *userdata);
+void    PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void    PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamSuspendedCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamMovedCallback(pa_stream *s, void *userdata);
+void    PULSE_ContextSuccessCallback(pa_context *c, int success, void *userdata);
+
+/* pulse.c: General Functions */
+void    PULSE_WaitForOperation(pa_operation *o);
+BOOL    PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+HRESULT PULSE_UsecToMMTime(pa_usec_t time, LPMMTIME lpTime, const pa_sample_spec *ss);
+
+/* pulse.c: Message Ring */
+int     PULSE_InitRingMessage(PULSE_MSG_RING* omr);
+int     PULSE_DestroyRingMessage(PULSE_MSG_RING* omr);
+void    PULSE_ResetRingMessage(PULSE_MSG_RING* omr);
+void    PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep);
+int     PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait);
+int     PULSE_RetrieveRingMessage(PULSE_MSG_RING* omr, enum win_wm_message *msg, DWORD *param, HANDLE *hEvent);
+
+/* pulse.c: Tracing */
+const char * PULSE_getCmdString(enum win_wm_message msg);
+#endif

winepulse-0.37-winecfg.patch:
 Bg.rc       |    1 +
 Cs.rc       |    1 +
 Da.rc       |    1 +
 De.rc       |    1 +
 En.rc       |    1 +
 Es.rc       |    1 +
 Fi.rc       |    1 +
 Fr.rc       |    1 +
 Hu.rc       |    1 +
 It.rc       |    1 +
 Ja.rc       |    1 +
 Ko.rc       |    1 +
 Lt.rc       |    1 +
 Nl.rc       |    1 +
 No.rc       |    1 +
 Pl.rc       |    1 +
 Pt.rc       |    1 +
 Ro.rc       |    1 +
 Ru.rc       |    1 +
 Si.rc       |    1 +
 Sv.rc       |    1 +
 Tr.rc       |    1 +
 Zh.rc       |    1 +
 audio.c     |    1 +
 libraries.c |    1 +
 resource.h  |    2 +-
 26 files changed, 26 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-0.37-winecfg.patch ---
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index d1ad34d..a95503c 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index a3f42d8..4758313 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardní"
     IDS_ACCEL_BASIC             "Základní"
     IDS_ACCEL_EMULATION         "Emulace"
+    IDS_DRIVER_PULSE            "Ovladaè PulseAudio"
     IDS_DRIVER_ALSA             "Ovladaè ALSA"
     IDS_DRIVER_ESOUND           "Ovladaè EsounD"
     IDS_DRIVER_OSS              "Ovladaè OSS"
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index 6e594cc..4d1778c 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -279,6 +279,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "GrundlÃ¦ggende"
     IDS_ACCEL_EMULATION         "EmulÃ©ring"
+    IDS_DRIVER_PULSE            "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index 885f986..265f006 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -278,6 +278,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Einfach"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio-Treiber"
     IDS_DRIVER_ALSA             "ALSA-Treiber"
     IDS_DRIVER_ESOUND           "EsounD-Treiber"
     IDS_DRIVER_OSS              "OSS-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 9fc42ea..5bd66f9 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -278,6 +278,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 0b9a8fa..a7496a8 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -277,6 +277,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Estándar"
     IDS_ACCEL_BASIC             "Básica"
     IDS_ACCEL_EMULATION         "Emulación"
+    IDS_DRIVER_PULSE            "Controlador PulseAudio"
     IDS_DRIVER_ALSA             "Controlador ALSA"
     IDS_DRIVER_ESOUND           "Controlador EsounD"
     IDS_DRIVER_OSS              "Controlador OSS"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 93c1e24..6beb0cb 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -266,6 +266,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index ebbcfdd..638025f 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -280,6 +280,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basique"
     IDS_ACCEL_EMULATION         "Ã‰mulation"
+    IDS_DRIVER_PULSE            "Pilote PulseAudio"
     IDS_DRIVER_ALSA             "Pilote ALSA"
     IDS_DRIVER_ESOUND           "Pilote EsounD"
     IDS_DRIVER_OSS              "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index 0fb4982..d7df634 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -266,6 +266,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc
index e738d22..cd64710 100644
--- a/programs/winecfg/It.rc
+++ b/programs/winecfg/It.rc
@@ -280,6 +280,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Base"
     IDS_ACCEL_EMULATION         "Emulazione"
+    IDS_DRIVER_PULSE            "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index a082856..e5a889b 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -281,6 +281,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "æ¨™æº–"
     IDS_ACCEL_BASIC             "åŸºæœ¬"
     IDS_ACCEL_EMULATION         "ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³"
+    IDS_DRIVER_PULSE            "PulseAudio ãƒ‰ãƒ©ã‚¤ãƒ"
     IDS_DRIVER_ALSA             "ALSA ãƒ‰ãƒ©ã‚¤ãƒ"
     IDS_DRIVER_ESOUND           "EsounD ãƒ‰ãƒ©ã‚¤ãƒ"
     IDS_DRIVER_OSS              "OSS ãƒ‰ãƒ©ã‚¤ãƒ"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index 673a70e..b92b146 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -281,6 +281,7 @@ BEGIN
    IDS_ACCEL_STANDARD          "Ç¥ÁØ"
    IDS_ACCEL_BASIC             "±âº»"
    IDS_ACCEL_EMULATION         "¾Ö¹Ä·¹ÀÌ¼Ç"
+    IDS_DRIVER_PULSE            "PulseAudio µå¶óÀÌ¹ö"
    IDS_DRIVER_ALSA             "ALSA µå¶óÀÌ¹ö"
    IDS_DRIVER_ESOUND           "EsounD µå¶óÀÌ¹ö"
    IDS_DRIVER_OSS              "OSS µå¶óÀÌ¹ö"
diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc
index 7a979f0..e4f7ff4 100644
--- a/programs/winecfg/Lt.rc
+++ b/programs/winecfg/Lt.rc
@@ -279,6 +279,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standartinis"
     IDS_ACCEL_BASIC             "Bazinis"
     IDS_ACCEL_EMULATION         "Emuliacija"
+    IDS_DRIVER_PULSE            "PulseAudio tvarkyklÄ—"
     IDS_DRIVER_ALSA             "ALSA tvarkyklÄ—"
     IDS_DRIVER_ESOUND           "EsounD tvarkyklÄ—"
     IDS_DRIVER_OSS              "OSS tvarkyklÄ—"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index 62ab796..8bb207e 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -279,6 +279,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standaard"
     IDS_ACCEL_BASIC             "Eenvoudig"
     IDS_ACCEL_EMULATION         "Emulatie"
+    IDS_DRIVER_PULSE            "PulseAudio Stuurprogramma"
     IDS_DRIVER_ALSA             "ALSA Stuurprogramma"
     IDS_DRIVER_ESOUND           "EsounD Stuurprogramma"
     IDS_DRIVER_OSS              "OSS Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index 338a291..b54bd8e 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -279,6 +279,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grunnleggende"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE            "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index 4cc4e85..9440ebc 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -280,6 +280,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardowe"
     IDS_ACCEL_BASIC             "Podstawowe"
     IDS_ACCEL_EMULATION         "Emulacja"
+    IDS_DRIVER_PULSE            "Sterownik PulseAudio"
     IDS_DRIVER_ALSA             "Sterownik ALSA"
     IDS_DRIVER_ESOUND           "Sterownik EsounD"
     IDS_DRIVER_OSS              "Sterownik OSS"
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index a4929d6..43ae7a7 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -460,6 +460,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "PadrÃ£o"
     IDS_ACCEL_BASIC             "BÃ¡sico"
     IDS_ACCEL_EMULATION         "EmulaÃ§Ã£o"
+    IDS_DRIVER_PULSE            "Controlador PulseAudio"
     IDS_DRIVER_ALSA             "Controlador ALSA"
     IDS_DRIVER_ESOUND           "Controlador EsounD"
     IDS_DRIVER_OSS              "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index f6fe5a0..cf96300 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -278,6 +278,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "De bazÄƒ"
     IDS_ACCEL_EMULATION         "Emulare"
+    IDS_DRIVER_PULSE            "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 1673c43..8a98fcd 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -283,6 +283,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¾Ðµ"
     IDS_ACCEL_BASIC             "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ"
     IDS_ACCEL_EMULATION         "ÐÐ¼ÑƒÐ»ÑÑ†Ð¸Ñ"
+    IDS_DRIVER_PULSE            "PulseAudio Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€"
     IDS_DRIVER_ALSA             "ALSA Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€"
     IDS_DRIVER_ESOUND           "EsounD Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€"
     IDS_DRIVER_OSS              "OSS Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€"
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index 50322b6..bf85f4d 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -278,6 +278,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardno"
     IDS_ACCEL_BASIC             "Osnovno"
     IDS_ACCEL_EMULATION         "Emulacija"
+    IDS_DRIVER_PULSE            "PulseAudio gonilnik"
     IDS_DRIVER_ALSA             "ALSA gonilnik"
     IDS_DRIVER_ESOUND           "EsounD gonilnik"
     IDS_DRIVER_OSS              "OSS gonilnik"
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 7e7f981..4d11a8c 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -266,6 +266,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundläggande"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE            "PulseAudio-drivrutin"
     IDS_DRIVER_ALSA             "ALSA-drivrutin"
     IDS_DRIVER_ESOUND           "EsounD-drivrutin"
     IDS_DRIVER_OSS              "OSS-drivrutin"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index c124900..09a0b27 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -266,6 +266,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standart"
     IDS_ACCEL_BASIC             "Temel"
     IDS_ACCEL_EMULATION         "Taklit"
+    IDS_DRIVER_PULSE            "PulseAudio Sürücüsü"
     IDS_DRIVER_ALSA             "ALSA Sürücüsü"
     IDS_DRIVER_ESOUND           "EsounD Sürücüsü"
     IDS_DRIVER_OSS              "OSS Sürücüsü"
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index 51b9d94..49df9be 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -271,6 +271,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "æ ‡å‡†"
     IDS_ACCEL_BASIC             "åŸºæœ¬"
     IDS_ACCEL_EMULATION         "è½¯ä»¶æ¨¡æ‹Ÿ"
+    IDS_DRIVER_PULSE            "PulseAudio é©±åŠ¨"
     IDS_DRIVER_ALSA             "ALSA é©±åŠ¨"
     IDS_DRIVER_ESOUND           "EsounD é©±åŠ¨"
     IDS_DRIVER_OSS              "OSS é©±åŠ¨"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 5cf2b34..35da236 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -89,6 +89,7 @@ typedef struct
 } AUDIO_DRIVER;
 
 static const AUDIO_DRIVER sAudioDrivers[] = {
+  {IDS_DRIVER_PULSE,     "pulse"},
   {IDS_DRIVER_ALSA,      "alsa"},
   {IDS_DRIVER_OSS,       "oss"},
   {IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index e402b4e..f0264ca 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -73,6 +73,7 @@ static const char * const builtin_only[] =
     "winedos",
     "winemp3.acm",
     "wineps",
+    "winepulse.drv",
     "winmm",
     "wintab32",
     "wnaspi32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 43651d8..160e01e 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -186,7 +186,7 @@
 #define IDS_ACCEL_BASIC                 8302
 #define IDS_ACCEL_EMULATION             8303
 #define IDS_DRIVER_ALSA                 8304
-
+#define IDS_DRIVER_PULSE                8305
 #define IDS_DRIVER_ESOUND               8306
 #define IDS_DRIVER_OSS                  8307
 #define IDS_DRIVER_JACK                 8308


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore	21 Feb 2010 11:35:00 -0000	1.86
+++ .cvsignore	19 Jun 2010 08:23:30 -0000	1.87
@@ -1 +1 @@
-wine-1.1.39-fe.tar.bz2
+wine-1.2-rc4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	21 Feb 2010 11:35:00 -0000	1.87
+++ sources	19 Jun 2010 08:23:30 -0000	1.88
@@ -1 +1 @@
-350e7f3199ed936704e0fad99a4ca326  wine-1.1.39-fe.tar.bz2
+761eaf2174aa1fff0b75059abf482e2f  wine-1.2-rc4.tar.bz2


Index: wine-notepad.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-notepad.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wine-notepad.desktop	24 Jun 2009 10:53:29 -0000	1.4
+++ wine-notepad.desktop	19 Jun 2010 08:23:31 -0000	1.5
@@ -2,6 +2,7 @@
 Name=Notepad
 Comment=Text Editor
 Exec=notepad
+Icon=notepad
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine-oleview.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-oleview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- wine-oleview.desktop	24 Jun 2009 10:53:30 -0000	1.1
+++ wine-oleview.desktop	19 Jun 2010 08:23:31 -0000	1.2
@@ -2,6 +2,7 @@
 Name=Wine OLE View
 Comment=Windows OLE View
 Exec=wine oleview
+Icon=wine
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine-regedit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-regedit.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wine-regedit.desktop	24 Jun 2009 10:53:30 -0000	1.4
+++ wine-regedit.desktop	19 Jun 2010 08:23:31 -0000	1.5
@@ -2,6 +2,7 @@
 Name=Regedit
 Comment=Wine registry editor
 Exec=regedit
+Icon=regedit
 Terminal=false
 Type=Application
 Encoding=UTF-8

wine-rpath.patch:
 configure |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-rpath.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- wine-rpath.patch	30 Oct 2009 14:57:27 -0000	1.9
+++ wine-rpath.patch	19 Jun 2010 08:23:31 -0000	1.10
@@ -1,6 +1,6 @@
---- configure.orig	2009-10-29 18:57:06.000000000 +0100
-+++ configure	2009-10-29 18:58:49.000000000 +0100
-@@ -6758,14 +6758,14 @@
+--- configure.old	2010-04-02 20:43:45.000000000 +0300
++++ configure		2010-04-03 23:26:57.365947610 +0300
+@@ -6727,14 +6727,14 @@ 
  
  fi
  
@@ -9,7 +9,7 @@
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
 +      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
-+$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
++$as_echo_n "checking whether the compiler supports -fPIC" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
@@ -18,22 +18,22 @@
 +CFLAGS="$CFLAGS -fPIC"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- int main(int argc, char *argv) { return 0; }
-@@ -6783,17 +6783,17 @@
+ int main(int argc, char **argv) { return 0; }
+@@ -6752,17 +6752,17 @@ 
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
  if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
 -  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
 +  LDRPATH_INSTALL=""
-+                       LDRPATH_LOCAL=""
++  LDRPATH_LOCAL=""
  else
 -  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
 +  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
-+$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
++$as_echo_n "checking whether the compiler supports -fPIC" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
@@ -42,4 +42,4 @@
 +CFLAGS="$CFLAGS -fPIC"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- int main(int argc, char *argv) { return 0; }
+ int main(int argc, char **argv) { return 0; }


Index: wine-uninstaller.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-uninstaller.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wine-uninstaller.desktop	14 May 2009 13:25:11 -0000	1.4
+++ wine-uninstaller.desktop	19 Jun 2010 08:23:31 -0000	1.5
@@ -2,6 +2,7 @@
 Name=Wine Software Uninstaller
 Comment=Interface to uninstall software
 Exec=wine uninstaller
+Icon=msiexec
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine-wineboot.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-wineboot.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wine-wineboot.desktop	24 Jun 2009 10:53:30 -0000	1.3
+++ wine-wineboot.desktop	19 Jun 2010 08:23:31 -0000	1.4
@@ -2,6 +2,7 @@
 Name=Wine Boot
 Comment=Simulate restart
 Exec=wineboot
+Icon=wine
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine-winecfg.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-winecfg.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wine-winecfg.desktop	18 Jun 2007 09:49:09 -0000	1.3
+++ wine-winecfg.desktop	19 Jun 2010 08:23:31 -0000	1.4
@@ -2,6 +2,7 @@
 Name=Wine Configuration
 Comment=Interface to set wine parameters
 Exec=winecfg
+Icon=winecfg
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine-winefile.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-winefile.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wine-winefile.desktop	18 Jun 2007 09:49:09 -0000	1.3
+++ wine-winefile.desktop	19 Jun 2010 08:23:31 -0000	1.4
@@ -2,6 +2,7 @@
 Name=Wine File
 Comment=Wine File Browser
 Exec=winefile
+Icon=winefile
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine-winemine.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-winemine.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wine-winemine.desktop	24 Nov 2008 22:19:32 -0000	1.3
+++ wine-winemine.desktop	19 Jun 2010 08:23:31 -0000	1.4
@@ -2,6 +2,7 @@
 Name=WineMine
 Comment=Wine Minesweeper 
 Exec=winemine
+Icon=winemine
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine-winhelp.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-winhelp.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wine-winhelp.desktop	24 Jun 2009 10:53:30 -0000	1.4
+++ wine-winhelp.desktop	19 Jun 2010 08:23:31 -0000	1.5
@@ -2,6 +2,7 @@
 Name=Wine Help
 Comment=Windows Help Browser
 Exec=wine winhlp32
+Icon=winhelp
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine-wordpad.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine-wordpad.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- wine-wordpad.desktop	24 Jun 2009 10:53:30 -0000	1.1
+++ wine-wordpad.desktop	19 Jun 2010 08:23:31 -0000	1.2
@@ -2,6 +2,7 @@
 Name=Wine Wordpad
 Comment=Text Editor
 Exec=wine wordpad
+Icon=wordpad
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- wine.spec	21 Feb 2010 11:35:00 -0000	1.121
+++ wine.spec	19 Jun 2010 08:23:31 -0000	1.122
@@ -1,18 +1,13 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.39
-Release:	1%{?dist}
+Version:	1.2.0
+Release:	0.4.rc4%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPLv2+
 URL:		http://www.winehq.org/
-# special fedora tarball without winemp3
-# It can be obtained by running rm -fr dlls/winemp3.acm in the winetree
-# and removing the references from configure, configure.ac, Makefile.in,
-# and programs/winecfg/libraries.c wrt. winemp3.
-
-Source0:        %{name}-%{version}-fe.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc4.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -37,22 +32,29 @@ Source201:      wine.directory
 # mime types
 Source300:      wine-mime-msi.desktop
 
+Patch1:         wine-rpath.patch
+
+# bugfixes
+# fix for #593140
+Patch100:       wine-fonts.patch
+
+# 
+Patch200:       wine-imagemagick-6.5.patch
+
 # explain how to use wine with pulseaudio
 # see http://bugs.winehq.org/show_bug.cgi?id=10495
 # and http://art.ified.ca/?page_id=40
-Patch400:       http://art.ified.ca/downloads/winepulse-0.35-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.35.patch
-Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-0.34-winecfg.patch
+# rebased for .42 see #580073
+Patch400:       winepulse-0.35-configure.ac.patch
+Patch401:       http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch
+Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-0.37-winecfg.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
-Patch1:         wine-rpath.patch
 
-# upstream bugs
-# currently non
 
-# bugfix patches
-# #533806
-Patch600:       wine-x86_64-prefix.patch
+# enhancements
+# add wine-gecko support
+Patch1000:      wine-gecko.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -108,11 +110,14 @@ BuildRequires:  gnutls-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  gsm-devel
 BuildRequires:  openal-soft-devel
-
-# noarch
-Requires:       wine-common = %{version}-%{release}
+BuildRequires:  libv4l-devel
+BuildRequires:  fontpackages-devel
+BuildRequires:  icoutils
+BuildRequires:  ImageMagick-devel
 Requires:       wine-desktop = %{version}-%{release}
-# 32bit
+Requires:       wine-fonts = %{version}-%{release}
+
+# 32bit parts
 Requires:       wine-core(x86-32) = %{version}-%{release}
 Requires:       wine-capi(x86-32) = %{version}-%{release}
 Requires:       wine-cms(x86-32) = %{version}-%{release}
@@ -127,6 +132,13 @@ Requires:       wine-cms(x86-64) = %{ver
 Requires:       wine-ldap(x86-64) = %{version}-%{release}
 Requires:       wine-twain(x86-64) = %{version}-%{release}
 Requires:       wine-pulseaudio(x86-64) = %{version}-%{release}
+Requires:       wine-wow(x86-64) = %{version}-%{release}
+Conflicts:      wine-wow(x86-32) = %{version}-%{release}
+%endif
+
+# 32bit only parts
+%ifarch %{ix86}
+Requires:      wine-wow(x86-32) = %{version}-%{release}
 %endif
 
 %description
@@ -144,13 +156,14 @@ wine-* sub packages.
 %package core
 Summary:        Wine core package
 Group:		Applications/Emulators
-Requires:       wine-fonts = %{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes:      wine <= 0.9.15-1%{?dist}
 Obsoletes:      wine-arts < 0.9.34
 Obsoletes:      wine-tools <= 1.1.27
 Provides:       wine-tools = %{version}-%{release}
+# require -common so we get wine.inf (#528335)
+Requires:       wine-common = %{version}-%{release}
 # fix dns resolution (#492700)
 # require both to be sure 64bit is present as well...
 %ifarch %{ix86}
@@ -166,9 +179,23 @@ Requires:       freetype(x86-64)
 Requires:       gnutls(x86-64)
 %endif
 
+
 %description core
 Wine core package includes the basic wine stuff needed by all other packages.
 
+%package wow
+Summary:        Files for wine wow seperation
+Group:          Applications/Emulators
+%ifarch x86_64
+Requires:       wine-core(x86-64) = %{version}-%{release}
+%else
+Requires:       wine-core(x86-32) = %{version}-%{release}
+%endif
+
+
+%description wow
+%{summary}
+
 %package desktop
 Summary:        Desktop integration features for wine
 Group:          Applications/Emulators
@@ -176,7 +203,7 @@ Requires(post): /sbin/chkconfig, /sbin/s
 Requires(post): desktop-file-utils >= 0.8
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): desktop-file-utils >= 0.8
-Requires:       wine-core = %{version}-%{release}
+Requires:       wine-core(x86-32) = %{version}-%{release}
 Requires:       wine-common = %{version}-%{release}
 BuildArch:      noarch
 
@@ -188,10 +215,86 @@ handler service.
 Summary:       Wine font files
 Group:         Applications/Emulators
 BuildArch:     noarch
+Requires:      wine-courier-fonts = %{version}-%{release}
+Requires:      wine-small-fonts = %{version}-%{release}
+Requires:      wine-system-fonts = %{version}-%{release}
+Requires:      wine-marlett-fonts = %{version}-%{release}
+#Requires:      wine-ms-sans-serif-fonts = %{version}-%{release}
+#Requires:      wine-tahoma-fonts = %{version}-%{release}
+Requires:      wine-symbol-fonts = %{version}-%{release}
+# intermediate fix for #593140
+Requires:      liberation-sans-fonts liberation-serif-fonts
 
 %description fonts
 %{summary}
 
+%package courier-fonts
+Summary:       Wine Courier font family
+Group:         User Interface/X
+BuildArch:     noarch
+Requires:      fontpackages-filesystem
+
+%description courier-fonts
+%{summary}
+
+%package small-fonts
+Summary:       Wine Small font family
+Group:         User Interface/X
+BuildArch:     noarch
+Requires:      fontpackages-filesystem
+
+%description small-fonts
+%{summary}
+
+%package system-fonts
+Summary:       Wine System font family
+Group:         User Interface/X
+BuildArch:     noarch
+Requires:      fontpackages-filesystem
+
+%description system-fonts
+%{summary}
+
+
+%package marlett-fonts
+Summary:       Wine Marlett font family
+Group:         User Interface/X
+BuildArch:     noarch
+Requires:      fontpackages-filesystem
+
+%description marlett-fonts
+%{summary}
+
+
+#%package ms-sans-serif-fonts
+#Summary:       Wine MS Sans Serif font family
+#Group:         User Interface/X
+#BuildArch:     noarch
+#Requires:      fontpackages-filesystem
+
+#%description ms-sans-serif-fonts
+#%{summary}
+
+
+#%package tahoma-fonts
+#Summary:       Wine Tahoma font family
+#Group:         User Interface/X
+#BuildArch:     noarch
+#Requires:      fontpackages-filesystem
+
+#%description tahoma-fonts
+#%{summary}
+
+
+%package symbol-fonts
+Summary:       Wine Symbol font family
+Group:         User Interface/X
+BuildArch:     noarch
+Requires:      fontpackages-filesystem
+
+%description symbol-fonts
+%{summary}
+
 %package common
 Summary:        Common files
 Group:		Applications/Emulators
@@ -307,21 +410,21 @@ This package adds an openal driver for w
 
 
 %prep
-%setup -q -n %{name}-%{version}-fe
+%setup -q -n %{name}-1.2-rc4
 
 %patch1
-%patch400 -p1
+%patch100
+%patch200
+%patch400
 %patch401 -p1
 %patch402 -p1
 
-%ifarch x86_64
-%patch600
-%endif
+%patch1000
 
 autoreconf
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -Wno-error"
 %configure \
 	--sysconfdir=%{_sysconfdir}/wine \
 	--x-includes=%{_includedir} --x-libraries=%{_libdir} \
@@ -333,8 +436,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
         --enable-maintainer-mode \
 	--disable-tests
 
-%{__make} depend
-
 %{__make} TARGETFLAGS="" %{?_smp_mflags}
 
 %install
@@ -347,17 +448,6 @@ rm -rf %{buildroot}
 	LDCONFIG=/bin/true \
 	UPDATE_DESKTOP_DATABASE=/bin/true
 
-%ifarch %{ix86}
-# rename wine to wine32
-mv %{buildroot}%{_bindir}/wine{,32}
-%endif
-
-# if x86_64 rename to wine64
-%ifarch x86_64
-mv %{buildroot}%{_bindir}/wine{,64}
-mv %{buildroot}%{_bindir}/wineserver{,64}
-%endif
-
 mkdir -p %{buildroot}%{_sysconfdir}/wine
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
@@ -374,86 +464,147 @@ install -p -m 644 %{SOURCE201} \
 
 
 # install desktop files
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -p -m 644 programs/winemenubuilder/wine.xpm \
+ %{buildroot}%{_datadir}/pixmaps/wine.xpm
+
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/notepad/ \
+ programs/notepad/notepad.ico
+install -p -m 644 programs/notepad/notepad*png \
+ %{buildroot}%{_datadir}/pixmaps/notepad.png
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE100}
 
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/regedit/ \
+ programs/regedit/regedit.ico
+install -p -m 644 programs/regedit/regedit*png \
+ %{buildroot}%{_datadir}/pixmaps/regedit.png
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE101}
 
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/msiexec/ \
+ programs/msiexec/msiexec.ico
+install -p -m 644 programs/msiexec/msiexec*png \
+ %{buildroot}%{_datadir}/pixmaps/msiexec.png
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE102}
 
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winecfg/ \
+ programs/winecfg/winecfg.ico
+install -p -m 644 programs/winecfg/winecfg*png \
+ %{buildroot}%{_datadir}/pixmaps/winecfg.png
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE103}
 
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winefile/ \
+ programs/winefile/winefile.ico
+install -p -m 644 programs/winefile/winefile*png \
+ %{buildroot}%{_datadir}/pixmaps/winefile.png
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE104}
 
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winemine/ \
+ programs/winemine/winemine.ico
+install -p -m 644 programs/winemine/winemine*png \
+ %{buildroot}%{_datadir}/pixmaps/winemine.png
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE105}
 
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winhlp32/ \
+ programs/winhlp32/winhelp.ico
+install -p -m 644 programs/winhlp32/winhelp*png \
+ %{buildroot}%{_datadir}/pixmaps/winhelp.png
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE106}
 
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE107}
 
+icotool -x --width=32 --height=32 --bit-depth=32 -o programs/wordpad/ \
+ programs/wordpad/wordpad.ico
+install -p -m 644 programs/wordpad/wordpad*png \
+ %{buildroot}%{_datadir}/pixmaps/wordpad.png
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE108}
 
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE109}
 
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop
+  %{buildroot}%{_datadir}/applications/wine.desktop
 
 #mime-types
 desktop-file-install \
   --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE300}
 
 
 cp %{SOURCE3} README-Fedora
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 
 %ifarch %{ix86}
-install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 %endif
 
 %ifarch x86_64
-install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 %endif
 
-install -p -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/wine
-
 # deploy pulseaudio readme
 cp %{SOURCE402} .
 
+# install fonts
+install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-courier-fonts
+mv %{buildroot}/%{_datadir}/wine/fonts/cou* %{buildroot}/%{_datadir}/fonts/wine-courier-fonts/
+
+install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-system-fonts
+mv %{buildroot}/%{_datadir}/wine/fonts/*sys.* %{buildroot}/%{_datadir}/fonts/wine-system-fonts/
+mv %{buildroot}/%{_datadir}/wine/fonts/vgas*.* %{buildroot}/%{_datadir}/fonts/wine-system-fonts/
+
+install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-small-fonts
+mv %{buildroot}/%{_datadir}/wine/fonts/sma* %{buildroot}/%{_datadir}/fonts/wine-small-fonts/
+mv %{buildroot}/%{_datadir}/wine/fonts/jsma* %{buildroot}/%{_datadir}/fonts/wine-small-fonts/
+
+install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-marlett-fonts
+mv %{buildroot}/%{_datadir}/wine/fonts/marlett.ttf %{buildroot}/%{_datadir}/fonts/wine-marlett-fonts/
+
+#install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-ms-sans-serif-fonts
+#mv %{buildroot}/%{_datadir}/wine/fonts/sse* %{buildroot}/%{_datadir}/fonts/wine-ms-sans-serif-fonts/
+rm -f %{buildroot}/%{_datadir}/wine/fonts/sse*
+
+#install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-tahoma-fonts
+#mv %{buildroot}/%{_datadir}/wine/fonts/tahoma* %{buildroot}/%{_datadir}/fonts/wine-tahoma-fonts/
+rm -f %{buildroot}/%{_datadir}/wine/fonts/tahoma*
+
+install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-symbol-fonts
+mv %{buildroot}/%{_datadir}/wine/fonts/symbol.ttf %{buildroot}/%{_datadir}/fonts/wine-symbol-fonts/
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -543,21 +694,22 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/write.exe.so
 %{_libdir}/wine/dxdiag.exe.so
 
+
 %ifarch %{ix86}
-%{_bindir}/wine32
+%{_bindir}/wine
 %{_bindir}/wine-preloader
-%{_bindir}/wineserver
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 %endif
+
 %ifarch x86_64
 %{_bindir}/wine64
-%{_bindir}/wineserver64
 %{_sysconfdir}/ld.so.conf.d/wine-64.conf
 %endif
 
 %dir %{_libdir}/wine
 %dir %{_libdir}/wine/fakedlls
 %{_libdir}/wine/fakedlls/*
+%{_libdir}/wine/attrib.exe.so
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
 %{_libdir}/wine/extrac32.exe.so
@@ -565,8 +717,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/mshta.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
+%{_libdir}/wine/ngen.exe.so
 %{_libdir}/wine/ntoskrnl.exe.so
 %{_libdir}/wine/oleview.exe.so
+%{_libdir}/wine/ping.exe.so
 %{_libdir}/wine/reg.exe.so
 %{_libdir}/wine/regedit.exe.so
 %{_libdir}/wine/regsvr32.exe.so
@@ -576,7 +730,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/services.exe.so
 %{_libdir}/wine/start.exe.so
 %{_libdir}/wine/termsv.exe.so
-%{_libdir}/wine/wineboot.exe.so
 %{_libdir}/wine/winebrowser.exe.so
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
@@ -630,6 +783,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/devenum.dll.so
 %{_libdir}/wine/dinput.dll.so
 %{_libdir}/wine/dinput8.dll.so
+%{_libdir}/wine/dispex.dll.so
 %{_libdir}/wine/dmband.dll.so
 %{_libdir}/wine/dmcompos.dll.so
 %{_libdir}/wine/dmime.dll.so
@@ -729,7 +883,11 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/msrle32.dll.so
 %{_libdir}/wine/mstask.dll.so
 %{_libdir}/wine/msvcirt.dll.so
+%{_libdir}/wine/msvcr70.dll.so
 %{_libdir}/wine/msvcr71.dll.so
+%{_libdir}/wine/msvcr80.dll.so
+%{_libdir}/wine/msvcr90.dll.so
+%{_libdir}/wine/msvcr100.dll.so
 %{_libdir}/wine/msvcrt.dll.so
 %{_libdir}/wine/msvcrt20.dll.so
 %{_libdir}/wine/msvcrt40.dll.so
@@ -779,6 +937,8 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/rsabase.dll.so
 %{_libdir}/wine/rsaenh.dll.so
 %{_libdir}/wine/rtutils.dll.so
+%{_libdir}/wine/samlib.dll.so
+%{_libdir}/wine/sc.exe.so
 %{_libdir}/wine/sccbase.dll.so
 %{_libdir}/wine/schannel.dll.so
 %{_libdir}/wine/secur32.dll.so
@@ -810,6 +970,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/updspapi.dll.so
 %{_libdir}/wine/url.dll.so
 %{_libdir}/wine/urlmon.dll.so
+%{_libdir}/wine/usbd.sys.so
 %{_libdir}/wine/user32.dll.so
 %{_libdir}/wine/usp10.dll.so
 %{_libdir}/wine/uxtheme.dll.so
@@ -922,12 +1083,18 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winsock.dll16.so
 %{_libdir}/wine/wintab.dll16.so
 %{_libdir}/wine/wow32.dll.so
-#%{_libdir}/wine/wprocs.dll16.so
 %endif
 
+%files wow
+%defattr(-,root,root,-)
+%ifarch %{ix86}
+%{_bindir}/wine
+%endif
+%{_bindir}/wineserver
+%{_libdir}/wine/wineboot.exe.so
+
 %files common
 %defattr(-,root,root,-)
-%{_bindir}/wineprefixcreate
 %{_bindir}/notepad
 %{_bindir}/winedbg
 %{_bindir}/winefile
@@ -937,22 +1104,52 @@ update-desktop-database &>/dev/null || :
 %{_bindir}/msiexec
 %{_bindir}/regedit
 %{_bindir}/regsvr32
-%{_bindir}/wine
 %{_bindir}/wineboot
 %{_bindir}/wineconsole
 %{_bindir}/winecfg
 %dir %{_datadir}/wine
 %{_mandir}/man1/wine.1.gz
 %{_mandir}/man1/wineserver.1*
-%{_mandir}/man1/wineprefixcreate.1*
-%lang(fr) %{_mandir}/fr.UTF-8/man1/*
+%lang(fr) %{_mandir}/fr.UTF-8/man1/wine.1*
+%lang(fr) %{_mandir}/fr.UTF-8/man1/wineserver.1*
+%lang(de) %{_mandir}/de.UTF-8/man1/wine.1*
+%lang(de) %{_mandir}/de.UTF-8/man1/wineserver.1*
 %{_datadir}/wine/generic.ppd
 %{_datadir}/wine/wine.inf
+%{_datadir}/wine/l_intl.nls
+%{_datadir}/pixmaps/*xpm
 
 %files fonts
 %defattr(-,root,root,-)
-%{_datadir}/wine/fonts
+%dir %{_datadir}/wine/fonts
+
+%files courier-fonts
+%defattr(-,root,root,-)
+%{_datadir}/fonts/wine-courier-fonts
+
+%files system-fonts
+%defattr(-,root,root,-)
+%{_datadir}/fonts/wine-system-fonts
 
+%files small-fonts
+%defattr(-,root,root,-)
+%{_datadir}/fonts/wine-small-fonts
+
+%files marlett-fonts
+%defattr(-,root,root,-)
+%{_datadir}/fonts/wine-marlett-fonts
+
+#%files ms-sans-serif-fonts
+#%defattr(-,root,root,-)
+#%{_datadir}/fonts/wine-ms-sans-serif-fonts
+
+#%files tahoma-fonts
+#%defattr(-,root,root,-)
+#%{_datadir}/fonts/wine-tahoma-fonts
+
+%files symbol-fonts
+%defattr(-,root,root,-)
+%{_datadir}/fonts/wine-symbol-fonts
 
 %files desktop
 %defattr(-,root,root,-)
@@ -971,6 +1168,7 @@ update-desktop-database &>/dev/null || :
 %{_datadir}/desktop-directories/Wine.directory
 %{_sysconfdir}/xdg/menus/applications-merged/wine.menu
 %{_initrddir}/wine
+%{_datadir}/pixmaps/*png
 
 # esd subpackage
 %files esd
@@ -1029,7 +1227,8 @@ 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*
+%lang(de) %{_mandir}/de.UTF-8/man1/winemaker.1*
+%lang(fr) %{_mandir}/fr.UTF-8/man1/winemaker.1*
 %attr(0755, root, root) %dir %{_includedir}/wine
 %{_includedir}/wine/*
 %{_libdir}/*.so
@@ -1055,6 +1254,77 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/openal32.dll.so
 
 %changelog
+* Fri Jun 18 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.4.rc4
+- version upgrade
+- fixes winecfg on 64bit (#541986)
+- require wine-common from -core to ensure man pages and wine.inf are present
+  (#528335)
+
+* Sun Jun 13 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.3.rc3
+- version upgrade
+
+* Mon May 31 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.2.rc2
+- version upgrade
+
+* Mon May 24 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.1.rc1
+- upgrade to rc1
+- add BR for ImageMagick and icoutils
+- spec cleanup
+- install available icon files (#594950)
+- desktop package requires wine x86-32 because of wine/wine64 rename
+- put system/small fonts in right place
+
+* Wed May 19 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.44-5
+- fix font issues
+
+* Thu May 13 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.44-4
+- fix install of 32bit only wine on x86_64 via install wine.i686
+
+* Wed May 12 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.44-3
+- move wine symlink to -wow for 32bit (#591690)
+
+* Tue May 11 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.44-2
+- fix manpage conflict between -common and -devel
+
+* Sun May 09 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.44-1
+- version upgrade (#580024)
+
+* Sun Apr 18 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.43-1
+- version upgrade
+
+* Sun Apr 11 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.42-1
+- version upgrade
+- rework for wow64
+
+* Mon Mar 29 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.41-3
+- add support for mingw32-wine-gecko
+
+* Sun Mar 28 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.41-2
+- convert to font package guidelines
+- add libv4l-devel BR
+
+* Sun Mar 28 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.41-1
+- version upgrade (#577587, #576607)
+- winepulse upgrade (0.36)
+
+* Sat Mar 06 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.40-1
+- version upgrade
+
 * Sun Feb 21 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.39-1
 - version upgrade

winepulse-0.35-configure.ac.patch:
 configure.ac |   29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

Index: winepulse-0.35-configure.ac.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/winepulse-0.35-configure.ac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- winepulse-0.35-configure.ac.patch	9 Feb 2010 09:18:17 -0000	1.1
+++ winepulse-0.35-configure.ac.patch	19 Jun 2010 08:23:31 -0000	1.2
@@ -1,16 +1,14 @@
-diff --git a/configure.ac b/configure.ac
-index f823045..583f9c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,6 +64,7 @@ AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
+--- configure.ac.orig	2010-05-10 16:39:57.000000000 +0200
++++ configure.ac	2010-05-10 16:42:54.000000000 +0200
+@@ -68,6 +68,7 @@
              [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
  AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
              [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
 +AC_ARG_WITH(pulse,     AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
  AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
- AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
- AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
-@@ -1308,6 +1309,30 @@ then
+ AC_ARG_WITH(tiff,       AS_HELP_STRING([--without-tiff],[do not use TIFF]),
+             [if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi])
+@@ -1361,6 +1362,31 @@
      CFLAGS="$save_CFLAGS"
  fi
  
@@ -38,10 +36,11 @@ index f823045..583f9c1 100644
 +WINE_WARNING_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"],
 +        [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.])
 +
++
  dnl **** Check for ALSA 1.x ****
  AC_SUBST(ALSALIBS,"")
  if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
-@@ -1460,7 +1485,7 @@ dnl **** Check for libodbc ****
+@@ -1528,7 +1554,7 @@
  WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
  
  dnl **** Check for any sound system ****
@@ -50,7 +49,7 @@ index f823045..583f9c1 100644
          "$ac_cv_header_sys_soundcard_h" != "yes" -a \
          "$ac_cv_header_machine_soundcard_h" != "yes" -a \
          "$ac_cv_header_soundcard_h" != "yes" -a \
-@@ -2555,6 +2580,7 @@ WINE_CONFIG_DLL(winenas.drv)
+@@ -2621,6 +2647,7 @@
  WINE_CONFIG_DLL(wineoss.drv)
  WINE_CONFIG_DLL(wineps.drv)
  WINE_CONFIG_DLL(wineps16.drv16,enable_win16)


--- wine-x86_64-prefix.patch DELETED ---


--- winepulse-0.34-winecfg.patch DELETED ---


--- winepulse-0.35.patch DELETED ---

