diff --git a/.gitignore b/.gitignore index 7ffd599..e24d48c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wine-1.2.tar.bz2 +wine-1.3.0.tar.bz2 diff --git a/sources b/sources index acdae65..70e2e97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb4e5423b277fc1e77807b04f366f7b7 wine-1.2.tar.bz2 +f266536a8096f6b705f2f802549dc0e5 wine-1.3.0.tar.bz2 diff --git a/wine-gecko.patch b/wine-gecko.patch index 93ea904..03d574d 100644 --- a/wine-gecko.patch +++ b/wine-gecko.patch @@ -114,13 +114,13 @@ && !install_from_default_dir() && !silent && (url = get_url())) DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc); ---- dlls/mshtml/Makefile.in.orig 2010-03-29 15:13:47.000000000 +0200 -+++ dlls/mshtml/Makefile.in 2010-03-29 15:49:55.000000000 +0200 +--- dlls/mshtml/Makefile.in.orig 2010-08-04 22:56:36.000000000 +0200 ++++ dlls/mshtml/Makefile.in 2010-08-04 22:56:52.000000000 +0200 @@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = mshtml.dll IMPORTLIB = mshtml --IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 +-IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 shell32 EXTRADEFS = -DCOM_NO_WINDOWS_H DELAYIMPORTS = wininet diff --git a/wine-preloader-segfault.patch b/wine-preloader-segfault.patch deleted file mode 100644 index 8988d24..0000000 --- a/wine-preloader-segfault.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wine-1.2/loader/preloader.c.atrandom 2010-07-16 17:05:45.000000000 +0200 -+++ wine-1.2/loader/preloader.c 2010-07-28 18:12:27.000000000 +0200 -@@ -519,7 +520,7 @@ static void set_auxiliary_values( ElfW(a - } - else if (new_count < delete_count) /* get rid of unused values */ - { -- int len = (char *)(av + av_count + 1) - dst; -+ int len = (char *)(av + av_count + 1) - src; - for (i = len - 1; i >= 0; i--) dst[i] = src[i]; - } - *stack = dst; diff --git a/wine.spec b/wine.spec index 5f8f818..e885790 100644 --- a/wine.spec +++ b/wine.spec @@ -1,13 +1,13 @@ %define no64bit 0 Name: wine -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?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.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.3.0.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -37,8 +37,6 @@ Patch1: wine-rpath.patch # bugfixes # fix for #593140 Patch100: wine-fonts.patch -# fix for #617968 -Patch101: wine-preloader-segfault.patch # Patch200: wine-imagemagick-6.5.patch @@ -422,11 +420,10 @@ This package adds an openal driver for wine. %endif %prep -%setup -q -n %{name}-1.2 +%setup -q %patch1 %patch100 -%patch101 -p1 %patch200 %patch400 -p1 %patch401 -p1 @@ -721,7 +718,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/write.exe.so %{_libdir}/wine/dxdiag.exe.so - %ifarch %{ix86} %{_bindir}/wine %{_bindir}/wine-preloader @@ -762,6 +758,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/winemenubuilder.exe.so %{_libdir}/wine/winecfg.exe.so %{_libdir}/wine/winedevice.exe.so +%{_libdir}/wine/wscript.exe.so %{_libdir}/wine/uninstaller.exe.so %{_libdir}/libwine.so.1* %{_libdir}/wine/acledit.dll.so @@ -839,6 +836,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/fltlib.dll.so %{_libdir}/wine/fusion.dll.so %{_libdir}/wine/fwpuclnt.dll.so +%{_libdir}/wine/gameux.dll.so %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/gdiplus.dll.so %{_libdir}/wine/glu32.dll.so @@ -910,6 +908,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/msrle32.dll.so %{_libdir}/wine/mstask.dll.so %{_libdir}/wine/msvcirt.dll.so +%{_libdir}/wine/msvcp90.dll.so %{_libdir}/wine/msvcr70.dll.so %{_libdir}/wine/msvcr71.dll.so %{_libdir}/wine/msvcr80.dll.so @@ -1292,6 +1291,10 @@ update-desktop-database &>/dev/null || : %endif %changelog +* Sat Jul 31 2010 Andreas Bierfert +- 1.3.0-1 +- version upgrade + * Wed Jul 28 2010 Andreas Bierfert - 1.2.0-2 - fix segfault (#617968)