rpms/wine/devel winepulse-0.37-winecfg.patch, NONE, 1.1 .cvsignore, 1.86, 1.87 sources, 1.87, 1.88 wine.spec, 1.124, 1.125 winepulse-0.36-winecfg.patch, 1.1, NONE
Andreas Bierfert
awjb at fedoraproject.org
Mon Jun 14 04:53:58 UTC 2010
- Previous message: rpms/wine/F-13 winepulse-0.37-winecfg.patch, NONE, 1.1 .cvsignore, 1.86, 1.87 sources, 1.87, 1.88 wine-uninstaller.desktop, 1.5, 1.6 wine.spec, 1.123, 1.124 winepulse-0.36-winecfg.patch, 1.1, NONE
- Next message: File ibus-el-0.1.1.tar.gz uploaded to lookaside cache by ueno
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22210/devel
Modified Files:
.cvsignore sources wine.spec
Added Files:
winepulse-0.37-winecfg.patch
Removed Files:
winepulse-0.36-winecfg.patch
Log Message:
- version upgrade
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/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore 31 May 2010 13:17:18 -0000 1.86
+++ .cvsignore 14 Jun 2010 04:53:57 -0000 1.87
@@ -1 +1 @@
-wine-1.2-rc2.tar.bz2
+wine-1.2-rc3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources 31 May 2010 13:17:18 -0000 1.87
+++ sources 14 Jun 2010 04:53:58 -0000 1.88
@@ -1 +1 @@
-99b4511a5a005a1ef363700d482f80f1 wine-1.2-rc2.tar.bz2
+d70dd15b72809d69330a9ede3ac02e4b wine-1.2-rc3.tar.bz2
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- wine.spec 31 May 2010 13:17:19 -0000 1.124
+++ wine.spec 14 Jun 2010 04:53:58 -0000 1.125
@@ -1,13 +1,13 @@
%define no64bit 0
Name: wine
Version: 1.2.0
-Release: 0.2.rc2%{?dist}
+Release: 0.3.rc3%{?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-rc2.tar.bz2
+Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc3.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.36-winecfg.patch
+Patch402: http://art.ified.ca/downloads/winepulse/winepulse-0.37-winecfg.patch
Source402: README-FEDORA-PULSEAUDIO
@@ -409,7 +409,7 @@ This package adds an openal driver for w
%prep
-%setup -q -n %{name}-1.2-rc2
+%setup -q -n %{name}-1.2-rc3
%patch1
%patch100
@@ -485,6 +485,10 @@ desktop-file-install \
--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=%{buildroot}%{_datadir}/applications \
@@ -1249,6 +1253,10 @@ update-desktop-database &>/dev/null || :
%{_libdir}/wine/openal32.dll.so
%changelog
+* Sun Jun 13 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.2.rc3
+- version upgrade
+
* Mon May 31 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.2-0.2.rc2
- version upgrade
--- winepulse-0.36-winecfg.patch DELETED ---
- Previous message: rpms/wine/F-13 winepulse-0.37-winecfg.patch, NONE, 1.1 .cvsignore, 1.86, 1.87 sources, 1.87, 1.88 wine-uninstaller.desktop, 1.5, 1.6 wine.spec, 1.123, 1.124 winepulse-0.36-winecfg.patch, 1.1, NONE
- Next message: File ibus-el-0.1.1.tar.gz uploaded to lookaside cache by ueno
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list