[wine] - 1.3.12-1 - version upgrade

[Andreas Bierfert]

commit b5ebb62139a5d36e8ce0287c9542379afae3f985
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon Jan 24 18:11:46 2011 +0100

    - 1.3.12-1
    - version upgrade

 .gitignore                     |    2 +
 sources                        |    2 +-
 wine.spec                      |   15 ++-
 winepulse-0.38-winecfg.patch   |  313 ----------------------------------------
 winepulse-winecfg-1.3.11.patch |   49 +++++++
 5 files changed, 64 insertions(+), 317 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf9b492..bf7b922 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /wine-1.3.8.tar.bz2
 /wine-1.3.9.tar.bz2
 /wine-1.3.10.tar.bz2
+/wine-1.3.11.tar.bz2
+/wine-1.3.12.tar.bz2
diff --git a/sources b/sources
index 1f5892b..fb0cf67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9f616cdcfb07a832c25623d3a971c3c  wine-1.3.10.tar.bz2
+a36a5e9ec4b72dc4fa8e0a10a23e8dee  wine-1.3.12.tar.bz2
diff --git a/wine.spec b/wine.spec
index ec7985e..2da744a 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,6 +1,6 @@
 %define no64bit 0
 Name:		wine
-Version:	1.3.10
+Version:	1.3.12
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -45,7 +45,7 @@ Patch200:       wine-imagemagick-6.5.patch
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse/winepulse-configure.ac-1.3.10.patch
 Patch401:       http://art.ified.ca/downloads/winepulse/winepulse-0.39.patch
-Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch
+Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-winecfg-1.3.11.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
 # enhancements
@@ -459,7 +459,7 @@ export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno
         --enable-maintainer-mode \
 	--disable-tests
 
-%{__make} TARGETFLAGS="" %{?_smp_mflags}
+%{__make} TARGETFLAGS="" #%{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -964,6 +964,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/netsh.exe.so
 %{_libdir}/wine/newdev.dll.so
+%{_libdir}/wine/normaliz.dll.so
 %{_libdir}/wine/npmshtml.dll.so
 %{_libdir}/wine/ntdll.dll.so
 %{_libdir}/wine/ntdsapi.dll.so
@@ -1340,6 +1341,14 @@ update-desktop-database &>/dev/null || :
 %endif
 
 %changelog
+* Mon Jan 24 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.12-1
+- version upgrade
+
+* Sun Jan 09 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.11-1
+- version upgrade
+
 * Tue Dec 28 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.3.10-1
 - version upgrade
diff --git a/winepulse-winecfg-1.3.11.patch b/winepulse-winecfg-1.3.11.patch
new file mode 100644
index 0000000..3c5c3f8
--- /dev/null
+++ b/winepulse-winecfg-1.3.11.patch
@@ -0,0 +1,49 @@
+diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
+index 4c90282..fcf3236 100644
+--- a/programs/winecfg/audio.c
++++ b/programs/winecfg/audio.c
+@@ -90,6 +90,7 @@ typedef struct
+ } AUDIO_DRIVER;
+ 
+ static 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 3bed6aa..2f347d9 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
+diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
+index f98a14d..314bd65 100644
+--- a/programs/winecfg/winecfg.rc
++++ b/programs/winecfg/winecfg.rc
+@@ -97,6 +97,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"