rpms/wine/EL-6 winepulse-0.38-winecfg.patch, NONE, 1.1 .cvsignore, 1.87, 1.88 sources, 1.88, 1.89 wine.spec, 1.122, 1.123 winepulse-0.37-winecfg.patch, 1.1, NONE
Andreas Bierfert
awjb at fedoraproject.org
Fri Jul 2 04:53:19 UTC 2010
Author: awjb
Update of /cvs/pkgs/rpms/wine/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23908
Modified Files:
.cvsignore sources wine.spec
Added Files:
winepulse-0.38-winecfg.patch
Removed Files:
winepulse-0.37-winecfg.patch
Log Message:
- pull from F12
winepulse-0.38-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.38-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 dcf8e37..d46f32e 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 6321fe8..279a99d 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -282,6 +282,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 f96b9ad..4d8a05b 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -611,6 +611,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 b391edc..70d79f7 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 93f6416..84bc6a0 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 134296d..1d70c03 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 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.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore 19 Jun 2010 08:23:30 -0000 1.87
+++ .cvsignore 2 Jul 2010 04:53:19 -0000 1.88
@@ -1 +1 @@
-wine-1.2-rc4.tar.bz2
+wine-1.2-rc5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources 19 Jun 2010 08:23:30 -0000 1.88
+++ sources 2 Jul 2010 04:53:19 -0000 1.89
@@ -1 +1 @@
-761eaf2174aa1fff0b75059abf482e2f wine-1.2-rc4.tar.bz2
+7a7911aec84ca059e623978db17fba19 wine-1.2-rc5.tar.bz2
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- wine.spec 19 Jun 2010 08:23:31 -0000 1.122
+++ wine.spec 2 Jul 2010 04:53:19 -0000 1.123
@@ -1,13 +1,13 @@
%define no64bit 0
Name: wine
Version: 1.2.0
-Release: 0.4.rc4%{?dist}
+Release: 0.5.rc5%{?dist}
Summary: A Windows 16/32/64 bit emulator
Group: Applications/Emulators
License: LGPLv2+
URL: http://www.winehq.org/
-Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc4.tar.bz2
+Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc5.tar.bz2
Source1: wine.init
Source3: wine-README-Fedora
Source4: wine-32.conf
@@ -47,7 +47,7 @@ Patch200: wine-imagemagick-6.5.pat
# 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
+Patch402: http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch
Source402: README-FEDORA-PULSEAUDIO
@@ -223,7 +223,7 @@ Requires: wine-marlett-fonts = %{ve
#Requires: wine-tahoma-fonts = %{version}-%{release}
Requires: wine-symbol-fonts = %{version}-%{release}
# intermediate fix for #593140
-Requires: liberation-sans-fonts liberation-serif-fonts
+Requires: liberation-sans-fonts liberation-serif-fonts liberation-narrow-fonts
%description fonts
%{summary}
@@ -410,7 +410,7 @@ This package adds an openal driver for w
%prep
-%setup -q -n %{name}-1.2-rc4
+%setup -q -n %{name}-1.2-rc5
%patch1
%patch100
@@ -418,7 +418,6 @@ This package adds an openal driver for w
%patch400
%patch401 -p1
%patch402 -p1
-
%patch1000
autoreconf
@@ -1254,6 +1253,11 @@ update-desktop-database &>/dev/null || :
%{_libdir}/wine/openal32.dll.so
%changelog
+* Sun Jun 27 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.5.rc5
+- version upgrade
+- require liberation-narrow-fonts
+
* Fri Jun 18 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.2-0.4.rc4
- version upgrade
--- winepulse-0.37-winecfg.patch DELETED ---
More information about the scm-commits
mailing list