From 6ee89ffdb9698272e70cc9b17ccd2923142ece61 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Mon, 14 Jun 2010 04:53:57 +0000 Subject: [PATCH] - version upgrade --- .cvsignore | 2 +- sources | 2 +- wine-uninstaller.desktop | 2 +- wine.spec | 16 ++- ...ecfg.patch => winepulse-0.37-winecfg.patch | 112 +++++++++--------- 5 files changed, 71 insertions(+), 63 deletions(-) rename winepulse-0.36-winecfg.patch => winepulse-0.37-winecfg.patch (87%) diff --git a/.cvsignore b/.cvsignore index 6c439f0..f2707d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.2-rc2.tar.bz2 +wine-1.2-rc3.tar.bz2 diff --git a/sources b/sources index 09fd0b6..d627474 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99b4511a5a005a1ef363700d482f80f1 wine-1.2-rc2.tar.bz2 +d70dd15b72809d69330a9ede3ac02e4b wine-1.2-rc3.tar.bz2 diff --git a/wine-uninstaller.desktop b/wine-uninstaller.desktop index 268c011..ef788ee 100644 --- a/wine-uninstaller.desktop +++ b/wine-uninstaller.desktop @@ -2,7 +2,7 @@ Name=Wine Software Uninstaller Comment=Interface to uninstall software Exec=wine uninstaller -Icon=wine +Icon=msiexec Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine.spec b/wine.spec index 819e895..4cc4831 100644 --- a/wine.spec +++ b/wine.spec @@ -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.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.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 wine. %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 +- 1.2-0.2.rc3 +- version upgrade + * Mon May 31 2010 Andreas Bierfert - 1.2-0.2.rc2 - version upgrade diff --git a/winepulse-0.36-winecfg.patch b/winepulse-0.37-winecfg.patch similarity index 87% rename from winepulse-0.36-winecfg.patch rename to winepulse-0.37-winecfg.patch index f73525a..837d40e 100644 --- a/winepulse-0.36-winecfg.patch +++ b/winepulse-0.37-winecfg.patch @@ -1,8 +1,8 @@ diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc -index 5555ad2..29ff717 100644 +index d1ad34d..a95503c 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc -@@ -276,6 +276,7 @@ BEGIN +@@ -272,6 +272,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" @@ -11,10 +11,10 @@ index 5555ad2..29ff717 100644 IDS_DRIVER_ESOUND "EsounD Driver" IDS_DRIVER_OSS "OSS Driver" diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc -index f3116d7..2a06d88 100644 +index a3f42d8..4758313 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc -@@ -276,6 +276,7 @@ BEGIN +@@ -272,6 +272,7 @@ BEGIN IDS_ACCEL_STANDARD "Standardn" IDS_ACCEL_BASIC "Zkladn" IDS_ACCEL_EMULATION "Emulace" @@ -23,22 +23,22 @@ index f3116d7..2a06d88 100644 IDS_DRIVER_ESOUND "Ovlada EsounD" IDS_DRIVER_OSS "Ovlada OSS" diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc -index 64e022b..e6caea3 100644 +index 6e594cc..4d1778c 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc -@@ -270,6 +270,7 @@ BEGIN +@@ -279,6 +279,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Grundlggende" - IDS_ACCEL_EMULATION "Emulring" + 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 fa5bbe5..eda4e2b 100644 +index 885f986..265f006 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc -@@ -282,6 +282,7 @@ BEGIN +@@ -278,6 +278,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Einfach" IDS_ACCEL_EMULATION "Emulation" @@ -47,10 +47,10 @@ index fa5bbe5..eda4e2b 100644 IDS_DRIVER_ESOUND "EsounD-Treiber" IDS_DRIVER_OSS "OSS-Treiber" diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc -index 490314a..3e669cd 100644 +index 9fc42ea..5bd66f9 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc -@@ -282,6 +282,7 @@ BEGIN +@@ -278,6 +278,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" @@ -59,22 +59,22 @@ index 490314a..3e669cd 100644 IDS_DRIVER_ESOUND "EsounD Driver" IDS_DRIVER_OSS "OSS Driver" diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc -index 423c783..8534cfa 100644 +index 0b9a8fa..a7496a8 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc -@@ -270,6 +270,7 @@ BEGIN +@@ -277,6 +277,7 @@ BEGIN IDS_ACCEL_STANDARD "Estndar" IDS_ACCEL_BASIC "Bsica" IDS_ACCEL_EMULATION "Emulacin" -+ IDS_DRIVER_PULSE "Manejador PulseAudio" - IDS_DRIVER_ALSA "Manejador ALSA" - IDS_DRIVER_ESOUND "Manejador EsounD" - IDS_DRIVER_OSS "Manejador OSS" ++ 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 957b87d..1eb62d1 100644 +index 93c1e24..6beb0cb 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc -@@ -270,6 +270,7 @@ BEGIN +@@ -266,6 +266,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" @@ -83,10 +83,10 @@ index 957b87d..1eb62d1 100644 IDS_DRIVER_ESOUND "EsounD Driver" IDS_DRIVER_OSS "OSS Driver" diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc -index f84cff6..045d93f 100644 +index ebbcfdd..638025f 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc -@@ -284,6 +284,7 @@ BEGIN +@@ -280,6 +280,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basique" IDS_ACCEL_EMULATION "Émulation" @@ -95,10 +95,10 @@ index f84cff6..045d93f 100644 IDS_DRIVER_ESOUND "Pilote EsounD" IDS_DRIVER_OSS "Pilote OSS" diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc -index 7c4e4fc..654b524 100644 +index 0fb4982..d7df634 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc -@@ -270,6 +270,7 @@ BEGIN +@@ -266,6 +266,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" @@ -107,10 +107,10 @@ index 7c4e4fc..654b524 100644 IDS_DRIVER_ESOUND "EsounD Driver" IDS_DRIVER_OSS "OSS Driver" diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc -index 29deea2..e328a19 100644 +index e738d22..cd64710 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc -@@ -284,6 +284,7 @@ BEGIN +@@ -280,6 +280,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Base" IDS_ACCEL_EMULATION "Emulazione" @@ -119,10 +119,10 @@ index 29deea2..e328a19 100644 IDS_DRIVER_ESOUND "Driver Esound" IDS_DRIVER_OSS "Driver OSS" diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc -index ff03564..94d7c62 100644 +index a082856..e5a889b 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc -@@ -285,6 +285,7 @@ BEGIN +@@ -281,6 +281,7 @@ BEGIN IDS_ACCEL_STANDARD "標準" IDS_ACCEL_BASIC "基本" IDS_ACCEL_EMULATION "エミュレーション" @@ -131,10 +131,10 @@ index ff03564..94d7c62 100644 IDS_DRIVER_ESOUND "EsounD ドライバ" IDS_DRIVER_OSS "OSS ドライバ" diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc -index b30ce87..36dabd2 100644 +index 673a70e..b92b146 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc -@@ -285,6 +285,7 @@ BEGIN +@@ -281,6 +281,7 @@ BEGIN IDS_ACCEL_STANDARD "ǥ" IDS_ACCEL_BASIC "⺻" IDS_ACCEL_EMULATION "ֹķ̼" @@ -143,10 +143,10 @@ index b30ce87..36dabd2 100644 IDS_DRIVER_ESOUND "EsounD ̹" IDS_DRIVER_OSS "OSS ̹" diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc -index 1a9d0fa..ff7a586 100644 +index 7a979f0..e4f7ff4 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc -@@ -283,6 +283,7 @@ BEGIN +@@ -279,6 +279,7 @@ BEGIN IDS_ACCEL_STANDARD "Standartinis" IDS_ACCEL_BASIC "Bazinis" IDS_ACCEL_EMULATION "Emuliacija" @@ -155,10 +155,10 @@ index 1a9d0fa..ff7a586 100644 IDS_DRIVER_ESOUND "EsounD tvarkyklė" IDS_DRIVER_OSS "OSS tvarkyklė" diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc -index 5783033..431872f 100644 +index 62ab796..8bb207e 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc -@@ -283,6 +283,7 @@ BEGIN +@@ -279,6 +279,7 @@ BEGIN IDS_ACCEL_STANDARD "Standaard" IDS_ACCEL_BASIC "Eenvoudig" IDS_ACCEL_EMULATION "Emulatie" @@ -167,10 +167,10 @@ index 5783033..431872f 100644 IDS_DRIVER_ESOUND "EsounD Stuurprogramma" IDS_DRIVER_OSS "OSS Stuurprogramma" diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc -index 13a62f4..7e66a3a 100644 +index 338a291..b54bd8e 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc -@@ -283,6 +283,7 @@ BEGIN +@@ -279,6 +279,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Grunnleggende" IDS_ACCEL_EMULATION "Emulering" @@ -179,10 +179,10 @@ index 13a62f4..7e66a3a 100644 IDS_DRIVER_ESOUND "EsounD-driver" IDS_DRIVER_OSS "OSS-driver" diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc -index 9422f34..eeca25c 100644 +index 4cc4e85..9440ebc 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc -@@ -273,6 +273,7 @@ BEGIN +@@ -280,6 +280,7 @@ BEGIN IDS_ACCEL_STANDARD "Standardowe" IDS_ACCEL_BASIC "Podstawowe" IDS_ACCEL_EMULATION "Emulacja" @@ -191,10 +191,10 @@ index 9422f34..eeca25c 100644 IDS_DRIVER_ESOUND "Sterownik EsounD" IDS_DRIVER_OSS "Sterownik OSS" diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc -index aeab826..c2e0200 100644 +index a4929d6..43ae7a7 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc -@@ -470,6 +470,7 @@ BEGIN +@@ -460,6 +460,7 @@ BEGIN IDS_ACCEL_STANDARD "Padrão" IDS_ACCEL_BASIC "Básico" IDS_ACCEL_EMULATION "Emulação" @@ -203,10 +203,10 @@ index aeab826..c2e0200 100644 IDS_DRIVER_ESOUND "Controlador EsounD" IDS_DRIVER_OSS "Controlador OSS" diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc -index c031ea8..430d6d8 100644 +index f6fe5a0..cf96300 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc -@@ -282,6 +282,7 @@ BEGIN +@@ -278,6 +278,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "De bază" IDS_ACCEL_EMULATION "Emulare" @@ -215,10 +215,10 @@ index c031ea8..430d6d8 100644 IDS_DRIVER_ESOUND "Driver Esound" IDS_DRIVER_OSS "Driver OSS" diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc -index 58252ba..39fb6d5 100644 +index 1673c43..8a98fcd 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc -@@ -287,6 +287,7 @@ BEGIN +@@ -283,6 +283,7 @@ BEGIN IDS_ACCEL_STANDARD "Стандартное" IDS_ACCEL_BASIC "Минимальное" IDS_ACCEL_EMULATION "Эмуляция" @@ -227,10 +227,10 @@ index 58252ba..39fb6d5 100644 IDS_DRIVER_ESOUND "EsounD драйвер" IDS_DRIVER_OSS "OSS драйвер" diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc -index eec1658..35b5462 100644 +index 50322b6..bf85f4d 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc -@@ -272,6 +272,7 @@ BEGIN +@@ -278,6 +278,7 @@ BEGIN IDS_ACCEL_STANDARD "Standardno" IDS_ACCEL_BASIC "Osnovno" IDS_ACCEL_EMULATION "Emulacija" @@ -239,10 +239,10 @@ index eec1658..35b5462 100644 IDS_DRIVER_ESOUND "EsounD gonilnik" IDS_DRIVER_OSS "OSS gonilnik" diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc -index d724afa..ba34d44 100644 +index 7e7f981..4d11a8c 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc -@@ -270,6 +270,7 @@ BEGIN +@@ -266,6 +266,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Grundlggande" IDS_ACCEL_EMULATION "Emulering" @@ -251,10 +251,10 @@ index d724afa..ba34d44 100644 IDS_DRIVER_ESOUND "EsounD-drivrutin" IDS_DRIVER_OSS "OSS-drivrutin" diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc -index 89ddb23..196debe 100644 +index c124900..09a0b27 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc -@@ -270,6 +270,7 @@ BEGIN +@@ -266,6 +266,7 @@ BEGIN IDS_ACCEL_STANDARD "Standart" IDS_ACCEL_BASIC "Temel" IDS_ACCEL_EMULATION "Taklit" @@ -263,10 +263,10 @@ index 89ddb23..196debe 100644 IDS_DRIVER_ESOUND "EsounD Srcs" IDS_DRIVER_OSS "OSS Srcs" diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc -index 14ac5c3..cd380a3 100644 +index 51b9d94..49df9be 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc -@@ -275,6 +275,7 @@ BEGIN +@@ -271,6 +271,7 @@ BEGIN IDS_ACCEL_STANDARD "标准" IDS_ACCEL_BASIC "基本" IDS_ACCEL_EMULATION "软件模拟" @@ -275,7 +275,7 @@ index 14ac5c3..cd380a3 100644 IDS_DRIVER_ESOUND "EsounD 驱动" IDS_DRIVER_OSS "OSS 驱动" diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c -index 9f8a0a2..59837ef 100644 +index 5cf2b34..35da236 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -89,6 +89,7 @@ typedef struct @@ -287,7 +287,7 @@ index 9f8a0a2..59837ef 100644 {IDS_DRIVER_OSS, "oss"}, {IDS_DRIVER_COREAUDIO, "coreaudio"}, diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c -index 19504d6..b5c84eb 100644 +index e402b4e..f0264ca 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -73,6 +73,7 @@ static const char * const builtin_only[] = @@ -299,10 +299,10 @@ index 19504d6..b5c84eb 100644 "wintab32", "wnaspi32", diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 15c905b..67616fb 100644 +index 43651d8..160e01e 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h -@@ -188,7 +188,7 @@ +@@ -186,7 +186,7 @@ #define IDS_ACCEL_BASIC 8302 #define IDS_ACCEL_EMULATION 8303 #define IDS_DRIVER_ALSA 8304