diff --git a/.cvsignore b/.cvsignore index d3e1bcb..3bcadfd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.2-rc4.tar.bz2 +wine-1.2-rc5.tar.bz2 diff --git a/sources b/sources index 5a633e5..376d4a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -761eaf2174aa1fff0b75059abf482e2f wine-1.2-rc4.tar.bz2 +7a7911aec84ca059e623978db17fba19 wine-1.2-rc5.tar.bz2 diff --git a/wine.spec b/wine.spec index 9a14c7c..a404712 100644 --- a/wine.spec +++ b/wine.spec @@ -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.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.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 = %{version}-%{release} #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 wine. %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 wine. %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 +- 1.2-0.5.rc5 +- version upgrade +- require liberation-narrow-fonts + * Fri Jun 18 2010 Andreas Bierfert - 1.2-0.4.rc4 - version upgrade diff --git a/winepulse-0.37-winecfg.patch b/winepulse-0.38-winecfg.patch similarity index 95% rename from winepulse-0.37-winecfg.patch rename to winepulse-0.38-winecfg.patch index 837d40e..30d17ed 100644 --- a/winepulse-0.37-winecfg.patch +++ b/winepulse-0.38-winecfg.patch @@ -59,7 +59,7 @@ index 9fc42ea..5bd66f9 100644 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 +index dcf8e37..d46f32e 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -277,6 +277,7 @@ BEGIN @@ -131,17 +131,17 @@ index a082856..e5a889b 100644 IDS_DRIVER_ESOUND "EsounD ドライバ" IDS_DRIVER_OSS "OSS ドライバ" diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc -index 673a70e..b92b146 100644 +index 6321fe8..279a99d 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 ̹" +@@ -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 @@ -191,10 +191,10 @@ index 4cc4e85..9440ebc 100644 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 +index f96b9ad..4d8a05b 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc -@@ -460,6 +460,7 @@ BEGIN +@@ -611,6 +611,7 @@ BEGIN IDS_ACCEL_STANDARD "Padrão" IDS_ACCEL_BASIC "Básico" IDS_ACCEL_EMULATION "Emulação" @@ -215,7 +215,7 @@ index f6fe5a0..cf96300 100644 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 +index b391edc..70d79f7 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -283,6 +283,7 @@ BEGIN @@ -263,7 +263,7 @@ index c124900..09a0b27 100644 IDS_DRIVER_ESOUND "EsounD Srcs" IDS_DRIVER_OSS "OSS Srcs" diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc -index 51b9d94..49df9be 100644 +index 93f6416..84bc6a0 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -271,6 +271,7 @@ BEGIN @@ -275,13 +275,13 @@ index 51b9d94..49df9be 100644 IDS_DRIVER_ESOUND "EsounD 驱动" IDS_DRIVER_OSS "OSS 驱动" diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c -index 5cf2b34..35da236 100644 +index 134296d..1d70c03 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c -@@ -89,6 +89,7 @@ typedef struct +@@ -90,6 +90,7 @@ typedef struct } AUDIO_DRIVER; - static const AUDIO_DRIVER sAudioDrivers[] = { + static AUDIO_DRIVER sAudioDrivers[] = { + {IDS_DRIVER_PULSE, "pulse"}, {IDS_DRIVER_ALSA, "alsa"}, {IDS_DRIVER_OSS, "oss"},