From d793dd7e39efd87a0b497a5738d58f5b84c13a3b Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <awjb@fedoraproject.org>
Date: Jun 11 2009 21:17:26 +0000
Subject: - version upgrade


---

diff --git a/.cvsignore b/.cvsignore
index ba3a325..80b2d9b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wine-1.1.21-fe.tar.bz2
+wine-1.1.23-fe.tar.bz2
diff --git a/adding-pulseaudio-to-winecfg.patch b/adding-pulseaudio-to-winecfg.patch
index f8770eb..eb1ffd6 100644
--- a/adding-pulseaudio-to-winecfg.patch
+++ b/adding-pulseaudio-to-winecfg.patch
@@ -178,18 +178,6 @@ index 830cabf..0ed1dbd 100644
      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 a4b0cad..c065d36 100644
---- a/programs/winecfg/Ro.rc
-+++ b/programs/winecfg/Ro.rc
-@@ -270,6 +270,7 @@ BEGIN
-     IDS_ACCEL_STANDARD          "Standard"
-     IDS_ACCEL_BASIC             "De basă"
-     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 782e1fd..f516399 100644
 --- a/programs/winecfg/Ru.rc
@@ -287,3 +275,15 @@ index a18fe76..1c4a1e7 100644
  #define IDS_DRIVER_ESOUND               8306
  #define IDS_DRIVER_OSS                  8307
  #define IDS_DRIVER_JACK                 8308
+diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
+index a4b0cad..c065d36 100644
+--- a/programs/winecfg/Ro.rc
++++ b/programs/winecfg/Ro.rc
+@@ -270,6 +270,7 @@
+     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/sources b/sources
index 6e93402..db75873 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b062451ee5e21189eea49cffd9bc0d8  wine-1.1.21-fe.tar.bz2
+eb26fea9e52e1cbbe48b107b23564988  wine-1.1.23-fe.tar.bz2
diff --git a/wine.spec b/wine.spec
index 0a9d89e..600a8c5 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,6 +1,6 @@
 Name:		wine
-Version:	1.1.21
-Release:	2%{?dist}
+Version:	1.1.23
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -587,7 +587,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/msvcrtd.dll.so
 %{_libdir}/wine/msvfw32.dll.so
 %{_libdir}/wine/msvidc32.dll.so
-%{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
 %{_libdir}/wine/nddeapi.dll.so
@@ -739,6 +738,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/mciqtz32.dll.so
 %{_libdir}/wine/mouse.drv16.so
 %{_libdir}/wine/msacm.dll16.so
+%{_libdir}/wine/msvideo.dll16.so
 %{_libdir}/wine/ole2.dll16.so
 %{_libdir}/wine/ole2conv.dll16.so
 %{_libdir}/wine/ole2disp.dll16.so
@@ -866,6 +866,11 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winepulse.drv.so
 
 %changelog
+* Wed Jun 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.23-1
+- version upgrade (#491321)
+- rediff pulseaudio patch (Michael Cronenworth)
+
 * Wed May 13 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.21-2
 - fix uninstaller (#500479)