From 93d42d4e5f73eca25b6296d7a2cee15aa228a4f9 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Sun, 28 Mar 2010 10:31:35 +0000 Subject: [PATCH 01/16] - update --- wine.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wine.spec b/wine.spec index 7bc9204..d206c63 100644 --- a/wine.spec +++ b/wine.spec @@ -1,6 +1,6 @@ %define no64bit 0 Name: wine -Version: 1.1.38 +Version: 1.1.40 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -1055,6 +1055,14 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Sat Mar 06 2010 Andreas Bierfert +- 1.1.40-1 +- version upgrade + +* Sun Feb 21 2010 Andreas Bierfert +- 1.1.39-1 +- version upgrade + * Tue Feb 09 2010 Andreas Bierfert - 1.1.38-1 - version upgrade From e2b7c35b40101c5a885a9aa40a1c22be2ffc4293 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Mon, 10 May 2010 17:04:22 +0000 Subject: [PATCH 02/16] - upgrade --- .cvsignore | 2 +- sources | 2 +- wine-const.patch | 20 ++ wine-gecko.patch | 127 +++++++++ wine-rpath.patch | 18 +- wine-x86_64-prefix.patch | 26 -- wine.spec | 251 +++++++++++++++--- winepulse-0.35-configure.ac.patch | 19 +- ...ecfg.patch => winepulse-0.36-winecfg.patch | 14 +- winepulse-0.35.patch => winepulse-0.36.patch | 6 +- 10 files changed, 387 insertions(+), 98 deletions(-) create mode 100644 wine-const.patch create mode 100644 wine-gecko.patch delete mode 100644 wine-x86_64-prefix.patch rename winepulse-0.34-winecfg.patch => winepulse-0.36-winecfg.patch (98%) rename winepulse-0.35.patch => winepulse-0.36.patch (99%) diff --git a/.cvsignore b/.cvsignore index 1f0c866..fdee59a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.1.38-fe.tar.bz2 +wine-1.1.44.tar.bz2 diff --git a/sources b/sources index 2286e73..230abeb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fdf4b8573b77da73b683e97128ee4150 wine-1.1.38-fe.tar.bz2 +f18649bd71b9099fecad22436d239cba wine-1.1.44.tar.bz2 diff --git a/wine-const.patch b/wine-const.patch new file mode 100644 index 0000000..fe8ab34 --- /dev/null +++ b/wine-const.patch @@ -0,0 +1,20 @@ +--- dlls/winhttp/net.c.old 2010-04-04 18:11:01.266148279 +0300 ++++ dlls/winhttp/net.c 2010-04-04 18:12:52.235163141 +0300 +@@ -91,7 +91,7 @@ + static void *libssl_handle; + static void *libcrypto_handle; + +-static SSL_METHOD *method; ++static const SSL_METHOD *method; + static SSL_CTX *ctx; + static int hostname_idx; + static int error_idx; +@@ -113,7 +113,7 @@ + static void *OpenSSL_ssl_handle; + static void *OpenSSL_crypto_handle; + +-static SSL_METHOD *meth; ++const static SSL_METHOD *meth; + static SSL_CTX *ctx; + static int hostname_idx; + static int error_idx; diff --git a/wine-gecko.patch b/wine-gecko.patch new file mode 100644 index 0000000..93ea904 --- /dev/null +++ b/wine-gecko.patch @@ -0,0 +1,127 @@ +--- dlls/mshtml/install.c.orig 2010-03-28 23:48:50.000000000 +0200 ++++ dlls/mshtml/install.c 2010-03-29 20:43:54.000000000 +0200 +@@ -284,6 +284,103 @@ + return ret; + } + ++static BOOL install_from_fedora_mingw32_wine_gecko(void) { ++ const char *data_dir, *subdir; ++ BOOL res; ++ ++ LPWSTR dos_dir_name; ++ LPSTR dos_dir_name_a; ++ static WCHAR *(*wine_get_dos_file_name)(const char*); ++ static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; ++ ++ char install_dir[MAX_PATH]; ++ char gecko_dir[MAX_PATH]; ++ ++ SHFILEOPSTRUCTA sf; ++ ++ TRACE("()\n"); ++ ++ if((data_dir = wine_get_data_dir())) ++ subdir = "/gecko/"; ++ else if((data_dir = wine_get_build_dir())) ++ subdir = "/../gecko/"; ++ else ++ return FALSE; ++ ++ TRACE("data_dir=%s\n",data_dir); ++ TRACE("subdir=%s\n",subdir); ++ ++ memcpy(gecko_dir, data_dir, MAX_PATH); ++ strncat(gecko_dir, subdir, MAX_PATH-strlen(gecko_dir)); ++ strncat(gecko_dir, GECKO_VERSION, MAX_PATH-strlen(gecko_dir)); ++ strncat(gecko_dir, "/", MAX_PATH-strlen(gecko_dir)); ++ ++ if(!wine_get_dos_file_name) ++ wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name"); ++ ++ if(wine_get_dos_file_name) { /* Wine UNIX mode */ ++ dos_dir_name = wine_get_dos_file_name(gecko_dir); ++ if(!dos_dir_name) { ++ ERR("Could not get dos file name of %s\n", debugstr_a(gecko_dir)); ++ return FALSE; ++ } ++ } else { ++ return FALSE; ++ } ++ ++ TRACE("gecko_dir=%s\n", debugstr_a(gecko_dir)); ++ TRACE("dos_dir_name=%s\n", debugstr_w(dos_dir_name)); ++ ++ ++ if(GetFileAttributesW(dos_dir_name) == INVALID_FILE_ATTRIBUTES) { ++ TRACE("mingw32-wine-gecko package not installed\n"); ++ return FALSE; ++ } ++ ++ GetSystemDirectoryA(install_dir, sizeof(install_dir)); ++ strncat(install_dir, "\\gecko\\",MAX_PATH-strlen(install_dir)); ++ res = CreateDirectoryA(install_dir, NULL); ++ if(!res && GetLastError() != ERROR_ALREADY_EXISTS) { ++ ERR("Could not create directory: %08u\n", GetLastError()); ++ return FALSE; ++ } ++ ++ strncat(install_dir, GECKO_VERSION, MAX_PATH-strlen(install_dir)); ++ res = CreateDirectoryA(install_dir, NULL); ++ if(!res && GetLastError() != ERROR_ALREADY_EXISTS) { ++ ERR("Could not create directory: %08u\n", GetLastError()); ++ return FALSE; ++ } ++ ++ TRACE("install_dir=%s\n",debugstr_a(install_dir)); ++ ++ dos_dir_name_a = heap_strdupWtoA(dos_dir_name); ++ ++ lstrcatA(dos_dir_name_a,"*.*"); ++ TRACE("dos_dir_name_a=%s\n",debugstr_a(dos_dir_name_a)); ++ ++ memset(&sf,0,sizeof(sf)); ++ sf.hwnd = 0; ++ sf.wFunc = FO_COPY; ++ sf.pFrom = dos_dir_name_a; ++ sf.pTo = install_dir; ++ sf.fFlags = FOF_NOCONFIRMATION, FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_SILENT; ++ res = SHFileOperationA(&sf); ++ ++ heap_free(dos_dir_name_a); ++ ++ if(res != 0) { ++ ERR("Could not copy files: %08u\n", GetLastError()); ++ return FALSE; ++ } ++ ++ set_registry(install_dir); ++ ++ clean_up(); ++ ++ return TRUE; ++} ++ + static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, + REFIID riid, void **ppv) + { +@@ -541,7 +638,8 @@ + * - $datadir/gecko + * - download from URL stored in GeckoUrl value of HKCU/Software/MSHTML key + */ +- if(!install_from_registered_dir() ++ if ( !install_from_fedora_mingw32_wine_gecko() ++ && !install_from_registered_dir() + && !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 +@@ -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 kernel32 shell32 + EXTRADEFS = -DCOM_NO_WINDOWS_H + DELAYIMPORTS = wininet + diff --git a/wine-rpath.patch b/wine-rpath.patch index f8f6585..3a66716 100644 --- a/wine-rpath.patch +++ b/wine-rpath.patch @@ -1,6 +1,6 @@ ---- configure.orig 2009-10-29 18:57:06.000000000 +0100 -+++ configure 2009-10-29 18:58:49.000000000 +0100 -@@ -6758,14 +6758,14 @@ +--- configure.old 2010-04-02 20:43:45.000000000 +0300 ++++ configure 2010-04-03 23:26:57.365947610 +0300 +@@ -6727,14 +6727,14 @@ fi @@ -9,7 +9,7 @@ -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } + as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5 -+$as_echo_n "checking whether the compiler supports -fPIC " >&6; } ++$as_echo_n "checking whether the compiler supports -fPIC" >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else @@ -18,22 +18,22 @@ +CFLAGS="$CFLAGS -fPIC" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - int main(int argc, char *argv) { return 0; } -@@ -6783,17 +6783,17 @@ + int main(int argc, char **argv) { return 0; } +@@ -6752,17 +6752,17 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then : - LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine" + LDRPATH_INSTALL="" -+ LDRPATH_LOCAL="" ++ LDRPATH_LOCAL="" else - as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; } + as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5 -+$as_echo_n "checking whether the compiler supports -fPIC " >&6; } ++$as_echo_n "checking whether the compiler supports -fPIC" >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else @@ -42,4 +42,4 @@ +CFLAGS="$CFLAGS -fPIC" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - int main(int argc, char *argv) { return 0; } + int main(int argc, char **argv) { return 0; } diff --git a/wine-x86_64-prefix.patch b/wine-x86_64-prefix.patch deleted file mode 100644 index 7f3e3ff..0000000 --- a/wine-x86_64-prefix.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- libs/wine/config.c.orig 2009-11-26 23:36:37.000000000 +0100 -+++ libs/wine/config.c 2009-11-26 23:37:36.000000000 +0100 -@@ -35,9 +35,9 @@ - #endif - #include "wine/library.h" - --static const char server_config_dir[] = "/.wine"; /* config dir relative to $HOME */ --static const char server_root_prefix[] = "/tmp/.wine-"; /* prefix for server root dir */ --static const char server_dir_prefix[] = "/server-"; /* prefix for server dir */ -+static const char server_config_dir[] = "/.wine-x86_64"; /* config dir relative to $HOME */ -+static const char server_root_prefix[] = "/tmp/.wine-x86_64-"; /* prefix for server root dir */ -+static const char server_dir_prefix[] = "/server-x86_64-"; /* prefix for server dir */ - - static char *bindir; - static char *dlldir; ---- dlls/ntdll/server.c.orig 2010-01-18 23:06:56.000000000 +0100 -+++ dlls/ntdll/server.c 2010-01-18 23:07:27.000000000 +0100 -@@ -698,7 +698,7 @@ - { - static int started; /* we only try once */ - char *argv[3]; -- static char wineserver[] = "server/wineserver"; -+ static char wineserver[] = "server/wineserver64"; - static char debug[] = "-d"; - - if (!started) diff --git a/wine.spec b/wine.spec index d206c63..b26d60a 100644 --- a/wine.spec +++ b/wine.spec @@ -1,18 +1,13 @@ %define no64bit 0 Name: wine -Version: 1.1.40 +Version: 1.1.44 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators License: LGPLv2+ URL: http://www.winehq.org/ -# special fedora tarball without winemp3 -# It can be obtained by running rm -fr dlls/winemp3.acm in the winetree -# and removing the references from configure, configure.ac, Makefile.in, -# and programs/winecfg/libraries.c wrt. winemp3. - -Source0: %{name}-%{version}-fe.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -37,22 +32,22 @@ Source201: wine.directory # mime types Source300: wine-mime-msi.desktop +Patch1: wine-rpath.patch + # explain how to use wine with pulseaudio # see http://bugs.winehq.org/show_bug.cgi?id=10495 # and http://art.ified.ca/?page_id=40 -Patch400: http://art.ified.ca/downloads/winepulse-0.35-configure.ac.patch -Patch401: http://art.ified.ca/downloads/winepulse-0.35.patch -Patch402: http://art.ified.ca/downloads/winepulse/winepulse-0.34-winecfg.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 Source402: README-FEDORA-PULSEAUDIO -Patch1: wine-rpath.patch -# upstream bugs -# currently non -# bugfix patches -# #533806 -Patch600: wine-x86_64-prefix.patch +# enhancements +# add wine-gecko support +Patch1000: wine-gecko.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -108,11 +103,15 @@ BuildRequires: gnutls-devel BuildRequires: pulseaudio-libs-devel BuildRequires: gsm-devel BuildRequires: openal-soft-devel +BuildRequires: libv4l-devel +BuildRequires: fontpackages-devel # noarch Requires: wine-common = %{version}-%{release} Requires: wine-desktop = %{version}-%{release} -# 32bit +Requires: wine-fonts = %{version}-%{release} + +# 32bit parts Requires: wine-core(x86-32) = %{version}-%{release} Requires: wine-capi(x86-32) = %{version}-%{release} Requires: wine-cms(x86-32) = %{version}-%{release} @@ -127,6 +126,13 @@ Requires: wine-cms(x86-64) = %{version}-%{release} Requires: wine-ldap(x86-64) = %{version}-%{release} Requires: wine-twain(x86-64) = %{version}-%{release} Requires: wine-pulseaudio(x86-64) = %{version}-%{release} +Requires: wine-wow(x86-64) = %{version}-%{release} +Conflicts: wine-wow(x86-32) = %{version}-%{release} +%endif + +# 32bit only parts +%ifarch %{ix86} +Requires: wine-wow = %{version}-%{release} %endif %description @@ -144,7 +150,6 @@ wine-* sub packages. %package core Summary: Wine core package Group: Applications/Emulators -Requires: wine-fonts = %{version}-%{release} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Obsoletes: wine <= 0.9.15-1%{?dist} @@ -166,9 +171,18 @@ Requires: freetype(x86-64) Requires: gnutls(x86-64) %endif + %description core Wine core package includes the basic wine stuff needed by all other packages. +%package wow +Summary: Files for wine wow seperation +Group: Applications/Emulators +Requires: wine-core = %{version}-%{release} + +%description wow +%{summary} + %package desktop Summary: Desktop integration features for wine Group: Applications/Emulators @@ -188,10 +202,84 @@ handler service. Summary: Wine font files Group: Applications/Emulators BuildArch: noarch +Requires: wine-courier-fonts = %{version}-%{release} +Requires: wine-small-fonts = %{version}-%{release} +Requires: wine-system-fonts = %{version}-%{release} +Requires: wine-marlett-fonts = %{version}-%{release} +#Requires: wine-ms-sans-serif-fonts = %{version}-%{release} +#Requires: wine-tahoma-fonts = %{version}-%{release} +Requires: wine-symbol-fonts = %{version}-%{release} %description fonts %{summary} +%package courier-fonts +Summary: Wine Courier font family +Group: User Interface/X +BuildArch: noarch +Requires: fontpackages-filesystem + +%description courier-fonts +%{summary} + +%package small-fonts +Summary: Wine Small font family +Group: User Interface/X +BuildArch: noarch +Requires: fontpackages-filesystem + +%description small-fonts +%{summary} + +%package system-fonts +Summary: Wine System font family +Group: User Interface/X +BuildArch: noarch +Requires: fontpackages-filesystem + +%description system-fonts +%{summary} + + +%package marlett-fonts +Summary: Wine Marlett font family +Group: User Interface/X +BuildArch: noarch +Requires: fontpackages-filesystem + +%description marlett-fonts +%{summary} + + +#%package ms-sans-serif-fonts +#Summary: Wine MS Sans Serif font family +#Group: User Interface/X +#BuildArch: noarch +#Requires: fontpackages-filesystem + +#%description ms-sans-serif-fonts +#%{summary} + + +#%package tahoma-fonts +#Summary: Wine Tahoma font family +#Group: User Interface/X +#BuildArch: noarch +#Requires: fontpackages-filesystem + +#%description tahoma-fonts +#%{summary} + + +%package symbol-fonts +Summary: Wine Symbol font family +Group: User Interface/X +BuildArch: noarch +Requires: fontpackages-filesystem + +%description symbol-fonts +%{summary} + %package common Summary: Common files Group: Applications/Emulators @@ -307,21 +395,19 @@ This package adds an openal driver for wine. %prep -%setup -q -n %{name}-%{version}-fe +%setup -q %patch1 -%patch400 -p1 +%patch400 %patch401 -p1 %patch402 -p1 -%ifarch x86_64 -%patch600 -%endif +%patch1000 autoreconf %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS -Wno-error" %configure \ --sysconfdir=%{_sysconfdir}/wine \ --x-includes=%{_includedir} --x-libraries=%{_libdir} \ @@ -350,12 +436,8 @@ rm -rf %{buildroot} %ifarch %{ix86} # rename wine to wine32 mv %{buildroot}%{_bindir}/wine{,32} -%endif - -# if x86_64 rename to wine64 -%ifarch x86_64 -mv %{buildroot}%{_bindir}/wine{,64} -mv %{buildroot}%{_bindir}/wineserver{,64} +# create link to wine32 if ix86 +ln -s %{_bindir}/wine32 %{buildroot}%{_bindir}/wine %endif mkdir -p %{buildroot}%{_sysconfdir}/wine @@ -449,11 +531,34 @@ install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ %endif -install -p -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/wine - # deploy pulseaudio readme cp %{SOURCE402} . +# install fonts +install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-courier-fonts +mv %{buildroot}/%{_datadir}/wine/fonts/cou* %{buildroot}/%{_datadir}/fonts/wine-courier-fonts/ + +install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-system-fonts +mv %{buildroot}/%{_datadir}/wine/fonts/*sys.* %{buildroot}/%{_datadir}/fonts/wine-system-fonts/ + +install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-small-fonts +mv %{buildroot}/%{_datadir}/wine/fonts/sma* %{buildroot}/%{_datadir}/fonts/wine-small-fonts/ + +install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-marlett-fonts +mv %{buildroot}/%{_datadir}/wine/fonts/marlett.ttf %{buildroot}/%{_datadir}/fonts/wine-marlett-fonts/ + +#install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-ms-sans-serif-fonts +#mv %{buildroot}/%{_datadir}/wine/fonts/sse* %{buildroot}/%{_datadir}/fonts/wine-ms-sans-serif-fonts/ +rm -f %{buildroot}/%{_datadir}/wine/fonts/sse* + +#install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-tahoma-fonts +#mv %{buildroot}/%{_datadir}/wine/fonts/tahoma* %{buildroot}/%{_datadir}/fonts/wine-tahoma-fonts/ +rm -f %{buildroot}/%{_datadir}/wine/fonts/tahoma* + +install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-symbol-fonts +mv %{buildroot}/%{_datadir}/wine/fonts/symbol.ttf %{buildroot}/%{_datadir}/fonts/wine-symbol-fonts/ + + %clean rm -rf %{buildroot} @@ -543,21 +648,22 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/write.exe.so %{_libdir}/wine/dxdiag.exe.so +%{_bindir}/wine + %ifarch %{ix86} %{_bindir}/wine32 %{_bindir}/wine-preloader -%{_bindir}/wineserver %{_sysconfdir}/ld.so.conf.d/wine-32.conf %endif + %ifarch x86_64 -%{_bindir}/wine64 -%{_bindir}/wineserver64 %{_sysconfdir}/ld.so.conf.d/wine-64.conf %endif %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls %{_libdir}/wine/fakedlls/* +%{_libdir}/wine/attrib.exe.so %{_libdir}/wine/cacls.exe.so %{_libdir}/wine/expand.exe.so %{_libdir}/wine/extrac32.exe.so @@ -565,8 +671,10 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/mshta.exe.so %{_libdir}/wine/msiexec.exe.so %{_libdir}/wine/net.exe.so +%{_libdir}/wine/ngen.exe.so %{_libdir}/wine/ntoskrnl.exe.so %{_libdir}/wine/oleview.exe.so +%{_libdir}/wine/ping.exe.so %{_libdir}/wine/reg.exe.so %{_libdir}/wine/regedit.exe.so %{_libdir}/wine/regsvr32.exe.so @@ -576,7 +684,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/services.exe.so %{_libdir}/wine/start.exe.so %{_libdir}/wine/termsv.exe.so -%{_libdir}/wine/wineboot.exe.so %{_libdir}/wine/winebrowser.exe.so %{_libdir}/wine/wineconsole.exe.so %{_libdir}/wine/winemenubuilder.exe.so @@ -630,6 +737,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/devenum.dll.so %{_libdir}/wine/dinput.dll.so %{_libdir}/wine/dinput8.dll.so +%{_libdir}/wine/dispex.dll.so %{_libdir}/wine/dmband.dll.so %{_libdir}/wine/dmcompos.dll.so %{_libdir}/wine/dmime.dll.so @@ -729,7 +837,11 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/msrle32.dll.so %{_libdir}/wine/mstask.dll.so %{_libdir}/wine/msvcirt.dll.so +%{_libdir}/wine/msvcr70.dll.so %{_libdir}/wine/msvcr71.dll.so +%{_libdir}/wine/msvcr80.dll.so +%{_libdir}/wine/msvcr90.dll.so +%{_libdir}/wine/msvcr100.dll.so %{_libdir}/wine/msvcrt.dll.so %{_libdir}/wine/msvcrt20.dll.so %{_libdir}/wine/msvcrt40.dll.so @@ -779,6 +891,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so %{_libdir}/wine/rtutils.dll.so +%{_libdir}/wine/sc.exe.so %{_libdir}/wine/sccbase.dll.so %{_libdir}/wine/schannel.dll.so %{_libdir}/wine/secur32.dll.so @@ -810,6 +923,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/updspapi.dll.so %{_libdir}/wine/url.dll.so %{_libdir}/wine/urlmon.dll.so +%{_libdir}/wine/usbd.sys.so %{_libdir}/wine/user32.dll.so %{_libdir}/wine/usp10.dll.so %{_libdir}/wine/uxtheme.dll.so @@ -922,12 +1036,15 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/winsock.dll16.so %{_libdir}/wine/wintab.dll16.so %{_libdir}/wine/wow32.dll.so -#%{_libdir}/wine/wprocs.dll16.so %endif +%files wow +%defattr(-,root,root,-) +%{_bindir}/wineserver +%{_libdir}/wine/wineboot.exe.so + %files common %defattr(-,root,root,-) -%{_bindir}/wineprefixcreate %{_bindir}/notepad %{_bindir}/winedbg %{_bindir}/winefile @@ -937,22 +1054,49 @@ update-desktop-database &>/dev/null || : %{_bindir}/msiexec %{_bindir}/regedit %{_bindir}/regsvr32 -%{_bindir}/wine %{_bindir}/wineboot %{_bindir}/wineconsole %{_bindir}/winecfg %dir %{_datadir}/wine %{_mandir}/man1/wine.1.gz %{_mandir}/man1/wineserver.1* -%{_mandir}/man1/wineprefixcreate.1* %lang(fr) %{_mandir}/fr.UTF-8/man1/* +%lang(de) %{_mandir}/de.UTF-8/man1/* %{_datadir}/wine/generic.ppd %{_datadir}/wine/wine.inf +%{_datadir}/wine/l_intl.nls %files fonts %defattr(-,root,root,-) %{_datadir}/wine/fonts +%files courier-fonts +%defattr(-,root,root,-) +%{_datadir}/fonts/wine-courier-fonts + +%files system-fonts +%defattr(-,root,root,-) +%{_datadir}/fonts/wine-system-fonts + +%files small-fonts +%defattr(-,root,root,-) +%{_datadir}/fonts/wine-small-fonts + +%files marlett-fonts +%defattr(-,root,root,-) +%{_datadir}/fonts/wine-marlett-fonts + +#%files ms-sans-serif-fonts +#%defattr(-,root,root,-) +#%{_datadir}/fonts/wine-ms-sans-serif-fonts + +#%files tahoma-fonts +#%defattr(-,root,root,-) +#%{_datadir}/fonts/wine-tahoma-fonts + +%files symbol-fonts +%defattr(-,root,root,-) +%{_datadir}/fonts/wine-symbol-fonts %files desktop %defattr(-,root,root,-) @@ -1055,6 +1199,33 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Sun May 09 2010 Andreas Bierfert +- 1.1.44-1 +- version upgrade (#580024) + +* Sun Apr 18 2010 Andreas Bierfert +- 1.1.43-1 +- version upgrade + +* Sun Apr 11 2010 Andreas Bierfert +- 1.1.42-1 +- version upgrade +- rework for wow64 + +* Mon Mar 29 2010 Andreas Bierfert +- 1.1.41-3 +- add support for mingw32-wine-gecko + +* Sun Mar 28 2010 Andreas Bierfert +- 1.1.41-2 +- convert to font package guidelines +- add libv4l-devel BR + +* Sun Mar 28 2010 Andreas Bierfert +- 1.1.41-1 +- version upgrade (#577587, #576607) +- winepulse upgrade (0.36) + * Sat Mar 06 2010 Andreas Bierfert - 1.1.40-1 - version upgrade diff --git a/winepulse-0.35-configure.ac.patch b/winepulse-0.35-configure.ac.patch index 0d4235b..9d5132d 100644 --- a/winepulse-0.35-configure.ac.patch +++ b/winepulse-0.35-configure.ac.patch @@ -1,16 +1,14 @@ -diff --git a/configure.ac b/configure.ac -index f823045..583f9c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,6 +64,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), +--- configure.ac.orig 2010-05-10 16:39:57.000000000 +0200 ++++ configure.ac 2010-05-10 16:42:54.000000000 +0200 +@@ -68,6 +68,7 @@ [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi]) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) +AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) - AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) - AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), -@@ -1308,6 +1309,30 @@ then + AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]), + [if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi]) +@@ -1361,6 +1362,31 @@ CFLAGS="$save_CFLAGS" fi @@ -37,11 +35,12 @@ index f823045..583f9c1 100644 +fi +WINE_WARNING_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"], + [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.]) ++ + dnl **** Check for ALSA 1.x **** AC_SUBST(ALSALIBS,"") if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes" -@@ -1460,7 +1485,7 @@ dnl **** Check for libodbc **** +@@ -1528,7 +1554,7 @@ WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) dnl **** Check for any sound system **** @@ -50,7 +49,7 @@ index f823045..583f9c1 100644 "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" -a \ -@@ -2555,6 +2580,7 @@ WINE_CONFIG_DLL(winenas.drv) +@@ -2621,6 +2647,7 @@ WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) diff --git a/winepulse-0.34-winecfg.patch b/winepulse-0.36-winecfg.patch similarity index 98% rename from winepulse-0.34-winecfg.patch rename to winepulse-0.36-winecfg.patch index 5635a97..f73525a 100644 --- a/winepulse-0.34-winecfg.patch +++ b/winepulse-0.36-winecfg.patch @@ -287,22 +287,22 @@ 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 37cc12b..7c13fad 100644 +index 19504d6..b5c84eb 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c -@@ -81,6 +81,7 @@ static const char * const builtin_only[] = - "wineoss.drv", +@@ -73,6 +73,7 @@ static const char * const builtin_only[] = + "winedos", + "winemp3.acm", "wineps", - "wineps.drv", + "winepulse.drv", - "winex11.drv", "winmm", "wintab32", + "wnaspi32", diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index f006861..57b2a15 100644 +index 15c905b..67616fb 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h -@@ -187,7 +187,7 @@ +@@ -188,7 +188,7 @@ #define IDS_ACCEL_BASIC 8302 #define IDS_ACCEL_EMULATION 8303 #define IDS_DRIVER_ALSA 8304 diff --git a/winepulse-0.35.patch b/winepulse-0.36.patch similarity index 99% rename from winepulse-0.35.patch rename to winepulse-0.36.patch index 9b809f2..7ea2ef1 100644 --- a/winepulse-0.35.patch +++ b/winepulse-0.36.patch @@ -1,9 +1,9 @@ diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in new file mode 100644 -index 0000000..80a751d +index 0000000..ed48381 --- /dev/null +++ b/dlls/winepulse.drv/Makefile.in -@@ -0,0 +1,16 @@ +@@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ @@ -18,8 +18,6 @@ index 0000000..80a751d + pulse.c + +@MAKE_DLL_RULES@ -+ -+@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c new file mode 100644 index 0000000..9dd1f80 From 77f02ef9eaea508c6ae01f2fd6099a9212dca806 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Tue, 11 May 2010 15:30:12 +0000 Subject: [PATCH 03/16] - fix man page problem --- wine.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/wine.spec b/wine.spec index b26d60a..9614a8b 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ %define no64bit 0 Name: wine Version: 1.1.44 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -1060,8 +1060,10 @@ update-desktop-database &>/dev/null || : %dir %{_datadir}/wine %{_mandir}/man1/wine.1.gz %{_mandir}/man1/wineserver.1* -%lang(fr) %{_mandir}/fr.UTF-8/man1/* -%lang(de) %{_mandir}/de.UTF-8/man1/* +%lang(fr) %{_mandir}/fr.UTF-8/man1/wine.1* +%lang(fr) %{_mandir}/fr.UTF-8/man1/wineserver.1* +%lang(de) %{_mandir}/de.UTF-8/man1/wine.1* +%lang(de) %{_mandir}/de.UTF-8/man1/wineserver.1* %{_datadir}/wine/generic.ppd %{_datadir}/wine/wine.inf %{_datadir}/wine/l_intl.nls @@ -1173,7 +1175,7 @@ update-desktop-database &>/dev/null || : %{_mandir}/man1/wrc.1* %{_mandir}/man1/winedbg.1* %{_mandir}/man1/wineg++.1* -%lang(de) %{_mandir}/de.UTF-8/man1/wine.1* +%lang(de) %{_mandir}/de.UTF-8/man1/winemaker.1* %attr(0755, root, root) %dir %{_includedir}/wine %{_includedir}/wine/* %{_libdir}/*.so @@ -1199,6 +1201,10 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Tue May 11 2010 Andreas Bierfert +- 1.1.44-2 +- fix manpage conflict between -common and -devel + * Sun May 09 2010 Andreas Bierfert - 1.1.44-1 - version upgrade (#580024) From 7d697810d13c7ca0b0d145badbb32bf4c0dc7927 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Wed, 12 May 2010 20:47:23 +0000 Subject: [PATCH 04/16] - fix 591690 --- wine.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/wine.spec b/wine.spec index 9614a8b..880743c 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ %define no64bit 0 Name: wine Version: 1.1.44 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -648,7 +648,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/write.exe.so %{_libdir}/wine/dxdiag.exe.so -%{_bindir}/wine %ifarch %{ix86} %{_bindir}/wine32 @@ -657,6 +656,7 @@ update-desktop-database &>/dev/null || : %endif %ifarch x86_64 +%{_bindir}/wine %{_sysconfdir}/ld.so.conf.d/wine-64.conf %endif @@ -1040,6 +1040,9 @@ update-desktop-database &>/dev/null || : %files wow %defattr(-,root,root,-) +%ifarch %{ix86} +%{_bindir}/wine +%endif %{_bindir}/wineserver %{_libdir}/wine/wineboot.exe.so @@ -1201,6 +1204,10 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Wed May 12 2010 Andreas Bierfert +- 1.1.44-3 +- move wine symlink to -wow for 32bit (#591690) + * Tue May 11 2010 Andreas Bierfert - 1.1.44-2 - fix manpage conflict between -common and -devel From 39310c956512b2892ddd6e788098cb530a6f868b Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 14 May 2010 08:29:04 +0000 Subject: [PATCH 05/16] - fix install of 32bit only wine on x86_64 via install wine.i686 --- wine.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/wine.spec b/wine.spec index 880743c..617b79f 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ %define no64bit 0 Name: wine Version: 1.1.44 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -132,7 +132,7 @@ Conflicts: wine-wow(x86-32) = %{version}-%{release} # 32bit only parts %ifarch %{ix86} -Requires: wine-wow = %{version}-%{release} +Requires: wine-wow(x86-32) = %{version}-%{release} %endif %description @@ -178,7 +178,12 @@ Wine core package includes the basic wine stuff needed by all other packages. %package wow Summary: Files for wine wow seperation Group: Applications/Emulators -Requires: wine-core = %{version}-%{release} +%ifarch x86_64 +Requires: wine-core(x86-64) = %{version}-%{release} +%else +Requires: wine-core(x86-32) = %{version}-%{release} +%endif + %description wow %{summary} @@ -1204,6 +1209,10 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Thu May 13 2010 Andreas Bierfert +- 1.1.44-4 +- fix install of 32bit only wine on x86_64 via install wine.i686 + * Wed May 12 2010 Andreas Bierfert - 1.1.44-3 - move wine symlink to -wow for 32bit (#591690) From 91ecb6b05ab484d83330555cd99cce384669c66b Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Mon, 31 May 2010 13:17:19 +0000 Subject: [PATCH 06/16] - version upgrade - add BR for ImageMagick and icoutils - spec cleanup - install available icon files (#594950) - desktop package requires wine x86-32 because of wine/wine64 rename - put system/small fonts in right place --- .cvsignore | 2 +- sources | 2 +- wine-fonts.patch | 183 +++++++++++++++++++++++++++++++++++++ wine-imagemagick-6.5.patch | 30 ++++++ wine-notepad.desktop | 1 + wine-oleview.desktop | 1 + wine-regedit.desktop | 1 + wine-uninstaller.desktop | 1 + wine-wineboot.desktop | 1 + wine-winecfg.desktop | 1 + wine-winefile.desktop | 1 + wine-winemine.desktop | 1 + wine-winhelp.desktop | 1 + wine-wordpad.desktop | 1 + wine.spec | 127 ++++++++++++++++++------- 15 files changed, 317 insertions(+), 37 deletions(-) create mode 100644 wine-fonts.patch create mode 100644 wine-imagemagick-6.5.patch diff --git a/.cvsignore b/.cvsignore index fdee59a..6c439f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.1.44.tar.bz2 +wine-1.2-rc2.tar.bz2 diff --git a/sources b/sources index 230abeb..09fd0b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f18649bd71b9099fecad22436d239cba wine-1.1.44.tar.bz2 +99b4511a5a005a1ef363700d482f80f1 wine-1.2-rc2.tar.bz2 diff --git a/wine-fonts.patch b/wine-fonts.patch new file mode 100644 index 0000000..bdc7504 --- /dev/null +++ b/wine-fonts.patch @@ -0,0 +1,183 @@ +--- dlls/gdi32/freetype.c.orig 2010-05-19 22:02:43.000000000 +0200 ++++ dlls/gdi32/freetype.c 2010-05-19 23:57:27.000000000 +0200 +@@ -400,7 +400,7 @@ + /* Interesting and well-known (frequently-assumed!) font names */ + static const WCHAR Lucida_Sans_Unicode[] = {'L','u','c','i','d','a',' ','S','a','n','s',' ','U','n','i','c','o','d','e',0}; + static const WCHAR Microsoft_Sans_Serif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0 }; +-static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; ++static const WCHAR Liberation[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0}; + static const WCHAR MS_UI_Gothic[] = {'M','S',' ','U','I',' ','G','o','t','h','i','c',0}; + static const WCHAR SimSun[] = {'S','i','m','S','u','n',0}; + static const WCHAR Gulim[] = {'G','u','l','i','m',0}; +@@ -1641,7 +1641,7 @@ + WCHAR *entry, *next; + SYSTEM_LINKS *font_link, *system_font_link; + CHILD_FONT *child_font; +- static const WCHAR tahoma_ttf[] = {'t','a','h','o','m','a','.','t','t','f',0}; ++ static const WCHAR liberation_ttf[] = {'L','i','b','e','r','a','t','i','o','n','S','a','n','s','-','R','e','g','u','l','a','r','.','t','t','f',0}; + static const WCHAR System[] = {'S','y','s','t','e','m',0}; + FONTSIGNATURE fs; + Family *family; +@@ -1723,25 +1723,25 @@ + RegCloseKey(hkey); + } + +- /* Explicitly add an entry for the system font, this links to Tahoma and any links +- that Tahoma has */ ++ /* Explicitly add an entry for the system font, this links to Liberation Sans and any links ++ that Liberation Sans has */ + + system_font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*system_font_link)); + system_font_link->font_name = strdupW(System); + list_init(&system_font_link->links); + +- face = find_face_from_filename(tahoma_ttf, Tahoma); ++ face = find_face_from_filename(liberation_ttf, Liberation); + if(face) + { + child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); + child_font->face = face; + child_font->font = NULL; +- TRACE("Found Tahoma in %s index %ld\n", child_font->face->file, child_font->face->face_index); ++ TRACE("Found Liberation Sans in %s index %ld\n", child_font->face->file, child_font->face->face_index); + list_add_tail(&system_font_link->links, &child_font->entry); + } + LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { +- if(!strcmpiW(font_link->font_name, Tahoma)) ++ if(!strcmpiW(font_link->font_name, Liberation)) + { + CHILD_FONT *font_link_entry; + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) +@@ -2193,21 +2193,21 @@ + /* Latin 1 (United States) */ + { 1252, 437, "vgaoem.fon", "vgafix.fon", "vgasys.fon", + "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", +- "Tahoma","Times New Roman", ++ "Liberation Sans","Times New Roman", + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + { 0 }, { 0 }, { 0 } + }, + /* Latin 1 (Multilingual) */ + { 1252, 850, "vga850.fon", "vgafix.fon", "vgasys.fon", + "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + { 0 }, { 0 }, { 0 } + }, + /* Eastern Europe */ + { 1250, 852, "vga852.fon", "vgafixe.fon", "vgasyse.fon", + "couree.fon", "serifee.fon", "smallee.fon", "sserifee.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + "Fixedsys,238", "System,238", + "Courier New,238", "MS Serif,238", "Small Fonts,238", + "MS Sans Serif,238", "MS Sans Serif,238", "MS Serif,238", +@@ -2218,7 +2218,7 @@ + /* Cyrillic */ + { 1251, 866, "vga866.fon", "vgafixr.fon", "vgasysr.fon", + "courer.fon", "serifer.fon", "smaller.fon", "sserifer.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + "Fixedsys,204", "System,204", + "Courier New,204", "MS Serif,204", "Small Fonts,204", + "MS Sans Serif,204", "MS Sans Serif,204", "MS Serif,204", +@@ -2229,7 +2229,7 @@ + /* Greek */ + { 1253, 737, "vga869.fon", "vgafixg.fon", "vgasysg.fon", + "coureg.fon", "serifeg.fon", "smalleg.fon", "sserifeg.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + "Fixedsys,161", "System,161", + "Courier New,161", "MS Serif,161", "Small Fonts,161", + "MS Sans Serif,161", "MS Sans Serif,161", "MS Serif,161", +@@ -2240,7 +2240,7 @@ + /* Turkish */ + { 1254, 857, "vga857.fon", "vgafixt.fon", "vgasyst.fon", + "couret.fon", "serifet.fon", "smallet.fon", "sserifet.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + "Fixedsys,162", "System,162", + "Courier New,162", "MS Serif,162", "Small Fonts,162", + "MS Sans Serif,162", "MS Sans Serif,162", "MS Serif,162", +@@ -2251,7 +2251,7 @@ + /* Hebrew */ + { 1255, 862, "vgaoem.fon", "vgaf1255.fon", "vgas1255.fon", + "coue1255.fon", "sere1255.fon", "smae1255.fon", "ssee1255.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + "Fixedsys,177", "System,177", + "Courier New,177", "MS Serif,177", "Small Fonts,177", + "MS Sans Serif,177", "MS Sans Serif,177", "MS Serif,177", +@@ -2260,7 +2260,7 @@ + /* Arabic */ + { 1256, 720, "vgaoem.fon", "vgaf1256.fon", "vgas1256.fon", + "coue1256.fon", "sere1256.fon", "smae1256.fon", "ssee1256.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + "Fixedsys,178", "System,178", + "Courier New,178", "MS Serif,178", "Small Fonts,178", + "MS Sans Serif,178", "MS Sans Serif,178", "MS Serif,178", +@@ -2269,7 +2269,7 @@ + /* Baltic */ + { 1257, 775, "vga775.fon", "vgaf1257.fon", "vgas1257.fon", + "coue1257.fon", "sere1257.fon", "smae1257.fon", "ssee1257.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + "Fixedsys,186", "System,186", + "Courier New,186", "MS Serif,186", "Small Fonts,186", + "MS Sans Serif,186", "MS Sans Serif,186", "MS Serif,186", +@@ -2280,14 +2280,14 @@ + /* Vietnamese */ + { 1258, 1258, "vga850.fon", "vgafix.fon", "vgasys.fon", + "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + { 0 }, { 0 }, { 0 } + }, + /* Thai */ + { 874, 874, "vga850.fon", "vgaf874.fon", "vgas874.fon", + "coure.fon", "serife.fon", "smalle.fon", "ssee874.fon", +- "Tahoma","Times New Roman", /* FIXME unverified */ ++ "Liberation Sans","Times New Roman", /* FIXME unverified */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + { 0 }, { 0 }, { 0 } + }, +@@ -2325,7 +2325,7 @@ + { + Lucida_Sans_Unicode, + Microsoft_Sans_Serif, +- Tahoma ++ Liberation + }; + + static const struct font_links_defaults_list +@@ -2337,7 +2337,7 @@ + } font_links_defaults_list[] = + { + /* Non East-Asian */ +- { Tahoma, /* FIXME unverified ordering */ ++ { Liberation, /* FIXME unverified ordering */ + { MS_UI_Gothic, SimSun, Gulim, PMingLiU, NULL } + }, + /* Below lists are courtesy of +--- tools/wine.inf.in.orig 2010-05-26 07:41:44.000000000 +0200 ++++ tools/wine.inf.in 2010-05-26 07:46:15.000000000 +0200 +@@ -576,13 +576,14 @@ + HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162" + HKLM,%FontSubStr%,"Helv",,"MS Sans Serif" + HKLM,%FontSubStr%,"Helvetica",,"Arial" +-HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma" ++HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Liberation Sans" + HKLM,%FontSubStr%,"Times",,"Times New Roman" + HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186" + HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238" + HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204" + HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161" + HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162" ++HKLM,%FontSubStr%,"MS Sans Serif",,"Liberation Serif" + HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060 + + [MCI] diff --git a/wine-imagemagick-6.5.patch b/wine-imagemagick-6.5.patch new file mode 100644 index 0000000..a591f83 --- /dev/null +++ b/wine-imagemagick-6.5.patch @@ -0,0 +1,30 @@ +--- configure.orig 2010-05-25 19:44:56.000000000 +0200 ++++ configure 2010-05-25 19:46:11.000000000 +0200 +@@ -5132,10 +5132,10 @@ + then + convert_version_major=`expr "$convert_version" : '.* \([0-9]*\)\.[0-9]*'` + convert_version_minor=`expr "$convert_version" : '.* [0-9]*\.\([0-9]*\)'` +- if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 ++ if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 5 + then + CONVERT=false +- as_fn_append wine_warnings "|imagemagick version 6.6 or newer is needed to rebuild icons." ++ as_fn_append wine_warnings "|imagemagick version 6.5 or newer is needed to rebuild icons." + fi + fi + if test "$CONVERT" = false +--- configure.ac.orig 2010-05-25 19:45:16.000000000 +0200 ++++ configure.ac 2010-05-25 19:46:44.000000000 +0200 +@@ -303,10 +303,10 @@ + then + convert_version_major=`expr "$convert_version" : '.* \([[0-9]]*\)\.[[0-9]]*'` + convert_version_minor=`expr "$convert_version" : '.* [[0-9]]*\.\([[0-9]]*\)'` +- if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 ++ if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 5 + then + CONVERT=false +- WINE_WARNING([imagemagick version 6.6 or newer is needed to rebuild icons.]) ++ WINE_WARNING([imagemagick version 6.5 or newer is needed to rebuild icons.]) + fi + fi + if test "$CONVERT" = false diff --git a/wine-notepad.desktop b/wine-notepad.desktop index fa5a1b1..e603069 100644 --- a/wine-notepad.desktop +++ b/wine-notepad.desktop @@ -2,6 +2,7 @@ Name=Notepad Comment=Text Editor Exec=notepad +Icon=notepad Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-oleview.desktop b/wine-oleview.desktop index 906f084..a458708 100644 --- a/wine-oleview.desktop +++ b/wine-oleview.desktop @@ -2,6 +2,7 @@ Name=Wine OLE View Comment=Windows OLE View Exec=wine oleview +Icon=wine Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-regedit.desktop b/wine-regedit.desktop index 7fb1c96..b032220 100644 --- a/wine-regedit.desktop +++ b/wine-regedit.desktop @@ -2,6 +2,7 @@ Name=Regedit Comment=Wine registry editor Exec=regedit +Icon=regedit Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-uninstaller.desktop b/wine-uninstaller.desktop index 8c16fdb..268c011 100644 --- a/wine-uninstaller.desktop +++ b/wine-uninstaller.desktop @@ -2,6 +2,7 @@ Name=Wine Software Uninstaller Comment=Interface to uninstall software Exec=wine uninstaller +Icon=wine Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-wineboot.desktop b/wine-wineboot.desktop index a29a3f6..6584aea 100644 --- a/wine-wineboot.desktop +++ b/wine-wineboot.desktop @@ -2,6 +2,7 @@ Name=Wine Boot Comment=Simulate restart Exec=wineboot +Icon=wine Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-winecfg.desktop b/wine-winecfg.desktop index 81c3b8d..2d28279 100644 --- a/wine-winecfg.desktop +++ b/wine-winecfg.desktop @@ -2,6 +2,7 @@ Name=Wine Configuration Comment=Interface to set wine parameters Exec=winecfg +Icon=winecfg Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-winefile.desktop b/wine-winefile.desktop index 43856d6..e35fb3d 100644 --- a/wine-winefile.desktop +++ b/wine-winefile.desktop @@ -2,6 +2,7 @@ Name=Wine File Comment=Wine File Browser Exec=winefile +Icon=winefile Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-winemine.desktop b/wine-winemine.desktop index f92401c..15b70d8 100644 --- a/wine-winemine.desktop +++ b/wine-winemine.desktop @@ -2,6 +2,7 @@ Name=WineMine Comment=Wine Minesweeper Exec=winemine +Icon=winemine Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-winhelp.desktop b/wine-winhelp.desktop index b9f5285..2d0ac67 100644 --- a/wine-winhelp.desktop +++ b/wine-winhelp.desktop @@ -2,6 +2,7 @@ Name=Wine Help Comment=Windows Help Browser Exec=wine winhlp32 +Icon=winhelp Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-wordpad.desktop b/wine-wordpad.desktop index d535956..1838b04 100644 --- a/wine-wordpad.desktop +++ b/wine-wordpad.desktop @@ -2,6 +2,7 @@ Name=Wine Wordpad Comment=Text Editor Exec=wine wordpad +Icon=wordpad Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine.spec b/wine.spec index 617b79f..819e895 100644 --- a/wine.spec +++ b/wine.spec @@ -1,13 +1,13 @@ %define no64bit 0 Name: wine -Version: 1.1.44 -Release: 4%{?dist} +Version: 1.2.0 +Release: 0.2.rc2%{?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/%{name}-%{version}.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc2.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -34,6 +34,13 @@ Source300: wine-mime-msi.desktop Patch1: wine-rpath.patch +# bugfixes +# fix for #593140 +Patch100: wine-fonts.patch + +# +Patch200: wine-imagemagick-6.5.patch + # explain how to use wine with pulseaudio # see http://bugs.winehq.org/show_bug.cgi?id=10495 # and http://art.ified.ca/?page_id=40 @@ -105,8 +112,8 @@ BuildRequires: gsm-devel BuildRequires: openal-soft-devel BuildRequires: libv4l-devel BuildRequires: fontpackages-devel - -# noarch +BuildRequires: icoutils +BuildRequires: ImageMagick-devel Requires: wine-common = %{version}-%{release} Requires: wine-desktop = %{version}-%{release} Requires: wine-fonts = %{version}-%{release} @@ -195,7 +202,7 @@ Requires(post): /sbin/chkconfig, /sbin/service, Requires(post): desktop-file-utils >= 0.8 Requires(preun): /sbin/chkconfig, /sbin/service Requires(postun): desktop-file-utils >= 0.8 -Requires: wine-core = %{version}-%{release} +Requires: wine-core(x86-32) = %{version}-%{release} Requires: wine-common = %{version}-%{release} BuildArch: noarch @@ -214,6 +221,8 @@ Requires: wine-marlett-fonts = %{version}-%{release} #Requires: wine-ms-sans-serif-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 %description fonts %{summary} @@ -400,9 +409,11 @@ This package adds an openal driver for wine. %prep -%setup -q +%setup -q -n %{name}-1.2-rc2 %patch1 +%patch100 +%patch200 %patch400 %patch401 -p1 %patch402 -p1 @@ -424,8 +435,6 @@ export CFLAGS="$RPM_OPT_FLAGS -Wno-error" --enable-maintainer-mode \ --disable-tests -%{__make} depend - %{__make} TARGETFLAGS="" %{?_smp_mflags} %install @@ -438,13 +447,6 @@ rm -rf %{buildroot} LDCONFIG=/bin/true \ UPDATE_DESKTOP_DATABASE=/bin/true -%ifarch %{ix86} -# rename wine to wine32 -mv %{buildroot}%{_bindir}/wine{,32} -# create link to wine32 if ix86 -ln -s %{_bindir}/wine32 %{buildroot}%{_bindir}/wine -%endif - mkdir -p %{buildroot}%{_sysconfdir}/wine # Allow users to launch Windows programs by just clicking on the .exe file... @@ -461,79 +463,111 @@ install -p -m 644 %{SOURCE201} \ # install desktop files +mkdir -p %{buildroot}%{_datadir}/pixmaps +install -p -m 644 programs/winemenubuilder/wine.xpm \ + %{buildroot}%{_datadir}/pixmaps/wine.xpm + +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/notepad/ \ + programs/notepad/notepad.ico +install -p -m 644 programs/notepad/notepad*png \ + %{buildroot}%{_datadir}/pixmaps/notepad.png desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE100} +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/regedit/ \ + programs/regedit/regedit.ico +install -p -m 644 programs/regedit/regedit*png \ + %{buildroot}%{_datadir}/pixmaps/regedit.png desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE101} desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE102} +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winecfg/ \ + programs/winecfg/winecfg.ico +install -p -m 644 programs/winecfg/winecfg*png \ + %{buildroot}%{_datadir}/pixmaps/winecfg.png desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE103} +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winefile/ \ + programs/winefile/winefile.ico +install -p -m 644 programs/winefile/winefile*png \ + %{buildroot}%{_datadir}/pixmaps/winefile.png desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE104} +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winemine/ \ + programs/winemine/winemine.ico +install -p -m 644 programs/winemine/winemine*png \ + %{buildroot}%{_datadir}/pixmaps/winemine.png desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE105} +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winhlp32/ \ + programs/winhlp32/winhelp.ico +install -p -m 644 programs/winhlp32/winhelp*png \ + %{buildroot}%{_datadir}/pixmaps/winhelp.png desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE106} desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE107} +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/wordpad/ \ + programs/wordpad/wordpad.ico +install -p -m 644 programs/wordpad/wordpad*png \ + %{buildroot}%{_datadir}/pixmaps/wordpad.png desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE108} desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE109} desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop + %{buildroot}%{_datadir}/applications/wine.desktop #mime-types desktop-file-install \ --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE300} cp %{SOURCE3} README-Fedora -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ %ifarch %{ix86} -install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ +install -p -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/ld.so.conf.d/ %endif %ifarch x86_64 -install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ +install -p -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ld.so.conf.d/ %endif # deploy pulseaudio readme @@ -545,9 +579,11 @@ mv %{buildroot}/%{_datadir}/wine/fonts/cou* %{buildroot}/%{_datadir}/fonts/wine- install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-system-fonts mv %{buildroot}/%{_datadir}/wine/fonts/*sys.* %{buildroot}/%{_datadir}/fonts/wine-system-fonts/ +mv %{buildroot}/%{_datadir}/wine/fonts/vgas*.* %{buildroot}/%{_datadir}/fonts/wine-system-fonts/ install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-small-fonts mv %{buildroot}/%{_datadir}/wine/fonts/sma* %{buildroot}/%{_datadir}/fonts/wine-small-fonts/ +mv %{buildroot}/%{_datadir}/wine/fonts/jsma* %{buildroot}/%{_datadir}/fonts/wine-small-fonts/ install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-marlett-fonts mv %{buildroot}/%{_datadir}/wine/fonts/marlett.ttf %{buildroot}/%{_datadir}/fonts/wine-marlett-fonts/ @@ -655,13 +691,13 @@ update-desktop-database &>/dev/null || : %ifarch %{ix86} -%{_bindir}/wine32 +%{_bindir}/wine %{_bindir}/wine-preloader %{_sysconfdir}/ld.so.conf.d/wine-32.conf %endif %ifarch x86_64 -%{_bindir}/wine +%{_bindir}/wine64 %{_sysconfdir}/ld.so.conf.d/wine-64.conf %endif @@ -896,6 +932,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so %{_libdir}/wine/rtutils.dll.so +%{_libdir}/wine/samlib.dll.so %{_libdir}/wine/sc.exe.so %{_libdir}/wine/sccbase.dll.so %{_libdir}/wine/schannel.dll.so @@ -1075,10 +1112,11 @@ update-desktop-database &>/dev/null || : %{_datadir}/wine/generic.ppd %{_datadir}/wine/wine.inf %{_datadir}/wine/l_intl.nls +%{_datadir}/pixmaps/*xpm %files fonts %defattr(-,root,root,-) -%{_datadir}/wine/fonts +%dir %{_datadir}/wine/fonts %files courier-fonts %defattr(-,root,root,-) @@ -1125,6 +1163,7 @@ update-desktop-database &>/dev/null || : %{_datadir}/desktop-directories/Wine.directory %{_sysconfdir}/xdg/menus/applications-merged/wine.menu %{_initrddir}/wine +%{_datadir}/pixmaps/*png # esd subpackage %files esd @@ -1184,6 +1223,7 @@ update-desktop-database &>/dev/null || : %{_mandir}/man1/winedbg.1* %{_mandir}/man1/wineg++.1* %lang(de) %{_mandir}/de.UTF-8/man1/winemaker.1* +%lang(fr) %{_mandir}/fr.UTF-8/man1/winemaker.1* %attr(0755, root, root) %dir %{_includedir}/wine %{_includedir}/wine/* %{_libdir}/*.so @@ -1209,6 +1249,23 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Mon May 31 2010 Andreas Bierfert +- 1.2-0.2.rc2 +- version upgrade + +* Mon May 24 2010 Andreas Bierfert +- 1.2-0.1.rc1 +- upgrade to rc1 +- add BR for ImageMagick and icoutils +- spec cleanup +- install available icon files (#594950) +- desktop package requires wine x86-32 because of wine/wine64 rename +- put system/small fonts in right place + +* Wed May 19 2010 Andreas Bierfert +- 1.1.44-5 +- fix font issues + * Thu May 13 2010 Andreas Bierfert - 1.1.44-4 - fix install of 32bit only wine on x86_64 via install wine.i686 From ae102fb5a6bfc0c27b7bee6341cb9b5a6f22e8c1 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Mon, 14 Jun 2010 04:53:58 +0000 Subject: [PATCH 07/16] - version upgrade --- .cvsignore | 2 +- sources | 2 +- wine.spec | 16 ++- ...ecfg.patch => winepulse-0.37-winecfg.patch | 112 +++++++++--------- 4 files changed, 70 insertions(+), 62 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.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 From a1e3ba13e89fcf1e184d4560cca722c50c095838 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Sat, 19 Jun 2010 08:23:30 +0000 Subject: [PATCH 08/16] - 1.2 rc4 - fix requires for -common --- .cvsignore | 2 +- sources | 2 +- wine-uninstaller.desktop | 2 +- wine.spec | 18 +++++++++++++----- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index f2707d7..d3e1bcb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.2-rc3.tar.bz2 +wine-1.2-rc4.tar.bz2 diff --git a/sources b/sources index d627474..5a633e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d70dd15b72809d69330a9ede3ac02e4b wine-1.2-rc3.tar.bz2 +761eaf2174aa1fff0b75059abf482e2f wine-1.2-rc4.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 4cc4831..9a14c7c 100644 --- a/wine.spec +++ b/wine.spec @@ -1,13 +1,13 @@ %define no64bit 0 Name: wine Version: 1.2.0 -Release: 0.3.rc3%{?dist} +Release: 0.4.rc4%{?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-rc3.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc4.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -114,7 +114,6 @@ BuildRequires: libv4l-devel BuildRequires: fontpackages-devel BuildRequires: icoutils BuildRequires: ImageMagick-devel -Requires: wine-common = %{version}-%{release} Requires: wine-desktop = %{version}-%{release} Requires: wine-fonts = %{version}-%{release} @@ -163,6 +162,8 @@ Obsoletes: wine <= 0.9.15-1%{?dist} Obsoletes: wine-arts < 0.9.34 Obsoletes: wine-tools <= 1.1.27 Provides: wine-tools = %{version}-%{release} +# require -common so we get wine.inf (#528335) +Requires: wine-common = %{version}-%{release} # fix dns resolution (#492700) # require both to be sure 64bit is present as well... %ifarch %{ix86} @@ -409,7 +410,7 @@ This package adds an openal driver for wine. %prep -%setup -q -n %{name}-1.2-rc3 +%setup -q -n %{name}-1.2-rc4 %patch1 %patch100 @@ -1253,8 +1254,15 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Fri Jun 18 2010 Andreas Bierfert +- 1.2-0.4.rc4 +- version upgrade +- fixes winecfg on 64bit (#541986) +- require wine-common from -core to ensure man pages and wine.inf are present + (#528335) + * Sun Jun 13 2010 Andreas Bierfert -- 1.2-0.2.rc3 +- 1.2-0.3.rc3 - version upgrade * Mon May 31 2010 Andreas Bierfert From a57ec58ea913864b15dbce160ed4607d3411e9ce Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Wed, 30 Jun 2010 20:03:01 +0000 Subject: [PATCH 09/16] - rc5 --- .cvsignore | 2 +- sources | 2 +- wine.spec | 16 +++++---- ...ecfg.patch => winepulse-0.38-winecfg.patch | 34 +++++++++---------- 4 files changed, 29 insertions(+), 25 deletions(-) rename winepulse-0.37-winecfg.patch => winepulse-0.38-winecfg.patch (95%) 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"}, From d583f9ddaf53be68138672c7c709813f95eec86a Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Sun, 4 Jul 2010 14:42:23 +0000 Subject: [PATCH 10/16] - rc6 - winepulse .38 - new wine icon --- .cvsignore | 2 +- sources | 2 +- wine.spec | 22 ++++++++++++------ winepulse-0.36.patch => winepulse-0.38.patch | 24 ++++++++++++-------- 4 files changed, 32 insertions(+), 18 deletions(-) rename winepulse-0.36.patch => winepulse-0.38.patch (99%) diff --git a/.cvsignore b/.cvsignore index 3bcadfd..5bf1046 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.2-rc5.tar.bz2 +wine-1.2-rc6.tar.bz2 diff --git a/sources b/sources index 376d4a1..f1519b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a7911aec84ca059e623978db17fba19 wine-1.2-rc5.tar.bz2 +689c6ae6baaa33ca6532af2cec05d26b wine-1.2-rc6.tar.bz2 diff --git a/wine.spec b/wine.spec index a404712..523a0a4 100644 --- a/wine.spec +++ b/wine.spec @@ -1,13 +1,13 @@ %define no64bit 0 Name: wine Version: 1.2.0 -Release: 0.5.rc5%{?dist} +Release: 0.6.rc6%{?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-rc5.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc6.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -46,7 +46,7 @@ Patch200: wine-imagemagick-6.5.patch # and http://art.ified.ca/?page_id=40 # rebased for .42 see #580073 Patch400: winepulse-0.35-configure.ac.patch -Patch401: http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch +Patch401: http://art.ified.ca/downloads/winepulse/winepulse-0.38.patch Patch402: http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch Source402: README-FEDORA-PULSEAUDIO @@ -410,7 +410,7 @@ This package adds an openal driver for wine. %prep -%setup -q -n %{name}-1.2-rc5 +%setup -q -n %{name}-1.2-rc6 %patch1 %patch100 @@ -464,8 +464,10 @@ install -p -m 644 %{SOURCE201} \ # install desktop files mkdir -p %{buildroot}%{_datadir}/pixmaps -install -p -m 644 programs/winemenubuilder/wine.xpm \ - %{buildroot}%{_datadir}/pixmaps/wine.xpm +icotool -x --width=32 --height=32 --bit-depth=32 -o dlls/user32/resources/ \ + dlls/user32/resources/oic_winlogo.ico +install -p -m 644 dlls/user32/resources/*png \ + %{buildroot}%{_datadir}/pixmaps/wine.png icotool -x --width=32 --height=32 --bit-depth=32 -o programs/notepad/ \ programs/notepad/notepad.ico @@ -1116,7 +1118,7 @@ update-desktop-database &>/dev/null || : %{_datadir}/wine/generic.ppd %{_datadir}/wine/wine.inf %{_datadir}/wine/l_intl.nls -%{_datadir}/pixmaps/*xpm +%{_datadir}/pixmaps/*png %files fonts %defattr(-,root,root,-) @@ -1253,6 +1255,12 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Sun Jul 04 2010 Andreas Bierfert +- 1.2-0.6.rc6 +- version upgrade +- use new winelogo from user32 +- winepulse upgrade + * Sun Jun 27 2010 Andreas Bierfert - 1.2-0.5.rc5 - version upgrade diff --git a/winepulse-0.36.patch b/winepulse-0.38.patch similarity index 99% rename from winepulse-0.36.patch rename to winepulse-0.38.patch index 7ea2ef1..6c4c271 100644 --- a/winepulse-0.36.patch +++ b/winepulse-0.38.patch @@ -831,10 +831,10 @@ index 0000000..9dd1f80 +} diff --git a/dlls/winepulse.drv/wavein.c b/dlls/winepulse.drv/wavein.c new file mode 100644 -index 0000000..8aea538 +index 0000000..af721b9 --- /dev/null +++ b/dlls/winepulse.drv/wavein.c -@@ -0,0 +1,588 @@ +@@ -0,0 +1,589 @@ +/* + * Wine Driver for PulseAudio - WaveIn Functionality + * http://pulseaudio.org/ @@ -1157,7 +1157,8 @@ index 0000000..8aea538 + TRACE("Asking to open %s for recording.\n", wdi->device_name); + pa_stream_connect_record(wwi->stream, wdi->device_name, &wwi->buffer_attr, + PA_STREAM_START_CORKED | -+ PA_STREAM_AUTO_TIMING_UPDATE); ++ PA_STREAM_AUTO_TIMING_UPDATE | ++ PA_STREAM_ADJUST_LATENCY); + + for (;;) { + pa_context_state_t cstate = pa_context_get_state(PULSE_context); @@ -1425,10 +1426,10 @@ index 0000000..8aea538 +#endif /* HAVE_PULSEAUDIO */ diff --git a/dlls/winepulse.drv/waveout.c b/dlls/winepulse.drv/waveout.c new file mode 100644 -index 0000000..989dff5 +index 0000000..99b7c18 --- /dev/null +++ b/dlls/winepulse.drv/waveout.c -@@ -0,0 +1,1024 @@ +@@ -0,0 +1,1029 @@ +/* + * Wine Driver for PulseAudio - WaveOut Functionality + * http://pulseaudio.org/ @@ -1472,6 +1473,9 @@ index 0000000..989dff5 + +#if HAVE_PULSEAUDIO + ++/* Use this to make the infinite wait not so infinite */ ++#define PULSE_INFINITE 10000 ++ +/* state diagram for waveOut writing: + * + * +---------+-------------+---------------+---------------------------------+ @@ -1628,6 +1632,8 @@ index 0000000..989dff5 + * Because of bugs pa_stream_set_buffer_attr() does not work on started + * streams for server version 0.9.11 to 0.9.14 */ + PULSE_WaitForOperation(pa_stream_set_buffer_attr(wwo->stream, &wwo->buffer_attr, PULSE_StreamSuccessCallback, wwo)); ++ TRACE("Triggering stream and hoping for the best\n"); ++ PULSE_WaitForOperation(pa_stream_trigger(wwo->stream, PULSE_StreamSuccessCallback, wwo)); + } + pa_threaded_mainloop_unlock(PULSE_ml); + } @@ -1651,8 +1657,8 @@ index 0000000..989dff5 + * - we hit the beginning of a running loop + * - we hit a wavehdr which hasn't finished playing + */ -+ if (lpWaveHdr == wwo->lpLoopPtr) { TRACE("loop %p\n", lpWaveHdr); return INFINITE; } -+ if (lpWaveHdr == wwo->lpPlayPtr) { TRACE("play %p\n", lpWaveHdr); return INFINITE; } ++ if (lpWaveHdr == wwo->lpLoopPtr) { TRACE("loop %p\n", lpWaveHdr); return PULSE_INFINITE; } ++ if (lpWaveHdr == wwo->lpPlayPtr) { TRACE("play %p\n", lpWaveHdr); return PULSE_INFINITE; } + + /* See if this data has been played, and if not, return when it will have been */ + wait = pa_bytes_to_usec(lpWaveHdr->reserved + lpWaveHdr->dwBufferLength, &wwo->sample_spec); @@ -1673,7 +1679,7 @@ index 0000000..989dff5 + } + /* No more wavehdrs */ + TRACE("Empty queue\n"); -+ return INFINITE; ++ return PULSE_INFINITE; +} + +/************************************************************************** @@ -2041,7 +2047,7 @@ index 0000000..989dff5 + /* Try and connect */ + TRACE("Connecting stream for playback on %s.\n", wdo->device_name); + pa_threaded_mainloop_lock(PULSE_ml); -+ pa_stream_connect_playback(wwo->stream, wdo->device_name, NULL, PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY, NULL, NULL); ++ pa_stream_connect_playback(wwo->stream, wdo->device_name, &wwo->buffer_attr, PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY, NULL, NULL); + + /* Wait for connection */ + for (;;) { From 493cffc050ba0305d56cf2f3afa90db775d299fe Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Mon, 12 Jul 2010 15:41:44 +0000 Subject: [PATCH 11/16] - version upgrade --- .cvsignore | 2 +- sources | 2 +- wine-const.patch | 20 ------------- wine.spec | 29 ++++++++++++++----- ...patch => winepulse-0.38-configure.ac.patch | 14 +++++---- 5 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 wine-const.patch rename winepulse-0.35-configure.ac.patch => winepulse-0.38-configure.ac.patch (88%) diff --git a/.cvsignore b/.cvsignore index 5bf1046..9fc1ac0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.2-rc6.tar.bz2 +wine-1.2-rc7.tar.bz2 diff --git a/sources b/sources index f1519b0..c6f48ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -689c6ae6baaa33ca6532af2cec05d26b wine-1.2-rc6.tar.bz2 +05cc63418e603f3d689bcaa7c7768d01 wine-1.2-rc7.tar.bz2 diff --git a/wine-const.patch b/wine-const.patch deleted file mode 100644 index fe8ab34..0000000 --- a/wine-const.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- dlls/winhttp/net.c.old 2010-04-04 18:11:01.266148279 +0300 -+++ dlls/winhttp/net.c 2010-04-04 18:12:52.235163141 +0300 -@@ -91,7 +91,7 @@ - static void *libssl_handle; - static void *libcrypto_handle; - --static SSL_METHOD *method; -+static const SSL_METHOD *method; - static SSL_CTX *ctx; - static int hostname_idx; - static int error_idx; -@@ -113,7 +113,7 @@ - static void *OpenSSL_ssl_handle; - static void *OpenSSL_crypto_handle; - --static SSL_METHOD *meth; -+const static SSL_METHOD *meth; - static SSL_CTX *ctx; - static int hostname_idx; - static int error_idx; diff --git a/wine.spec b/wine.spec index 523a0a4..5f30c0d 100644 --- a/wine.spec +++ b/wine.spec @@ -1,13 +1,13 @@ %define no64bit 0 Name: wine Version: 1.2.0 -Release: 0.6.rc6%{?dist} +Release: 0.7.rc7%{?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-rc6.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc7.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -44,8 +44,7 @@ Patch200: wine-imagemagick-6.5.patch # explain how to use wine with pulseaudio # see http://bugs.winehq.org/show_bug.cgi?id=10495 # and http://art.ified.ca/?page_id=40 -# rebased for .42 see #580073 -Patch400: winepulse-0.35-configure.ac.patch +Patch400: http://art.ified.ca/downloads/winepulse/winepulse-0.38-configure.ac.patch Patch401: http://art.ified.ca/downloads/winepulse/winepulse-0.38.patch Patch402: http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch Source402: README-FEDORA-PULSEAUDIO @@ -223,7 +222,10 @@ 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 liberation-narrow-fonts +Requires: liberation-sans-fonts liberation-serif-fonts liberation-mono-fonts +%if 0%{?fedora} > 12 || 0%{?rhel} > 6 +Requires: liberation-narrow-fonts +%endif %description fonts %{summary} @@ -410,12 +412,12 @@ This package adds an openal driver for wine. %prep -%setup -q -n %{name}-1.2-rc6 +%setup -q -n %{name}-1.2-rc7 %patch1 %patch100 %patch200 -%patch400 +%patch400 -p1 %patch401 -p1 %patch402 -p1 %patch1000 @@ -1126,30 +1128,37 @@ update-desktop-database &>/dev/null || : %files courier-fonts %defattr(-,root,root,-) +%doc COPYING.LIB %{_datadir}/fonts/wine-courier-fonts %files system-fonts %defattr(-,root,root,-) +%doc COPYING.LIB %{_datadir}/fonts/wine-system-fonts %files small-fonts %defattr(-,root,root,-) +%doc COPYING.LIB %{_datadir}/fonts/wine-small-fonts %files marlett-fonts +%doc COPYING.LIB %defattr(-,root,root,-) %{_datadir}/fonts/wine-marlett-fonts #%files ms-sans-serif-fonts #%defattr(-,root,root,-) +#%doc COPYING.LIB #%{_datadir}/fonts/wine-ms-sans-serif-fonts #%files tahoma-fonts #%defattr(-,root,root,-) +#%doc COPYING.LIB #%{_datadir}/fonts/wine-tahoma-fonts %files symbol-fonts %defattr(-,root,root,-) +%doc COPYING.LIB %{_datadir}/fonts/wine-symbol-fonts %files desktop @@ -1255,6 +1264,12 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/openal32.dll.so %changelog +* Sun Jul 11 2010 Andreas Bierfert +- 1.2-0.7.rc7 +- version upgrade +- make sure font packages include the license file in case they are installed + standalone + * Sun Jul 04 2010 Andreas Bierfert - 1.2-0.6.rc6 - version upgrade diff --git a/winepulse-0.35-configure.ac.patch b/winepulse-0.38-configure.ac.patch similarity index 88% rename from winepulse-0.35-configure.ac.patch rename to winepulse-0.38-configure.ac.patch index 9d5132d..d44a4e6 100644 --- a/winepulse-0.35-configure.ac.patch +++ b/winepulse-0.38-configure.ac.patch @@ -1,6 +1,8 @@ ---- configure.ac.orig 2010-05-10 16:39:57.000000000 +0200 -+++ configure.ac 2010-05-10 16:42:54.000000000 +0200 -@@ -68,6 +68,7 @@ +diff --git a/configure.ac b/configure.ac +index 61f376e..6fe1261 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi]) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) @@ -8,7 +10,7 @@ AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]), [if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi]) -@@ -1361,6 +1362,31 @@ +@@ -1386,6 +1387,31 @@ then CFLAGS="$save_CFLAGS" fi @@ -40,7 +42,7 @@ dnl **** Check for ALSA 1.x **** AC_SUBST(ALSALIBS,"") if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes" -@@ -1528,7 +1554,7 @@ +@@ -1553,7 +1579,7 @@ dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) dnl **** Check for any sound system **** @@ -49,7 +51,7 @@ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" -a \ -@@ -2621,6 +2647,7 @@ +@@ -2648,6 +2674,7 @@ WINE_CONFIG_DLL(winenas.drv) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) From 19ae37f6cd7fef749752e69d622751b4371f0c63 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 16 Jul 2010 19:58:04 +0000 Subject: [PATCH 12/16] - 1.2 final - improve fonts patch --- .cvsignore | 2 +- sources | 2 +- wine-fonts.patch | 81 +++++++++++++++++++++++-------------- wine.spec | 103 ++++++++++++++++++++++++++++++----------------- 4 files changed, 120 insertions(+), 68 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9fc1ac0..7ffd599 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.2-rc7.tar.bz2 +wine-1.2.tar.bz2 diff --git a/sources b/sources index c6f48ee..acdae65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05cc63418e603f3d689bcaa7c7768d01 wine-1.2-rc7.tar.bz2 +eb4e5423b277fc1e77807b04f366f7b7 wine-1.2.tar.bz2 diff --git a/wine-fonts.patch b/wine-fonts.patch index bdc7504..72385ae 100644 --- a/wine-fonts.patch +++ b/wine-fonts.patch @@ -1,5 +1,23 @@ +--- tools/wine.inf.in.orig 2010-05-26 07:41:44.000000000 +0200 ++++ tools/wine.inf.in 2010-05-26 07:46:15.000000000 +0200 +@@ -576,13 +576,14 @@ + HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162" + HKLM,%FontSubStr%,"Helv",,"MS Sans Serif" + HKLM,%FontSubStr%,"Helvetica",,"Arial" +-HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma" ++HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Liberation Sans" + HKLM,%FontSubStr%,"Times",,"Times New Roman" + HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186" + HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238" + HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204" + HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161" + HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162" ++HKLM,%FontSubStr%,"MS Sans Serif",,"Liberation Serif" + HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060 + + [MCI] --- dlls/gdi32/freetype.c.orig 2010-05-19 22:02:43.000000000 +0200 -+++ dlls/gdi32/freetype.c 2010-05-19 23:57:27.000000000 +0200 ++++ dlls/gdi32/freetype.c 2010-07-16 11:43:15.000000000 +0200 @@ -400,7 +400,7 @@ /* Interesting and well-known (frequently-assumed!) font names */ static const WCHAR Lucida_Sans_Unicode[] = {'L','u','c','i','d','a',' ','S','a','n','s',' ','U','n','i','c','o','d','e',0}; @@ -9,7 +27,17 @@ static const WCHAR MS_UI_Gothic[] = {'M','S',' ','U','I',' ','G','o','t','h','i','c',0}; static const WCHAR SimSun[] = {'S','i','m','S','u','n',0}; static const WCHAR Gulim[] = {'G','u','l','i','m',0}; -@@ -1641,7 +1641,7 @@ +@@ -494,6 +494,9 @@ + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\', + 'S','y','s','t','e','m','L','i','n','k',0}; + ++static const char liberationsans[] = {'Z',':','\\','u','s','r','\\','s','h','a','r','e','\\','f','o','n','t','s','\\','l','i','b','e','r','a','t','i','o','n','\\','L','i','b','e','r','a','t','i','o','n','S','a','n','s','-','R','e','g','u','l','a','r','.','t','t','f',0}; ++static const char liberationserif[] = {'Z',':','\\','u','s','r','\\','s','h','a','r','e','\\','f','o','n','t','s','\\','l','i','b','e','r','a','t','i','o','n','\\','L','i','b','e','r','a','t','i','o','n','S','e','r','i','f','-','R','e','g','u','l','a','r','.','t','t','f',0}; ++ + /**************************************** + * Notes on .fon files + * +@@ -1641,7 +1644,7 @@ WCHAR *entry, *next; SYSTEM_LINKS *font_link, *system_font_link; CHILD_FONT *child_font; @@ -18,7 +46,7 @@ static const WCHAR System[] = {'S','y','s','t','e','m',0}; FONTSIGNATURE fs; Family *family; -@@ -1723,25 +1723,25 @@ +@@ -1723,25 +1726,25 @@ RegCloseKey(hkey); } @@ -49,7 +77,7 @@ { CHILD_FONT *font_link_entry; LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) -@@ -2193,21 +2193,21 @@ +@@ -2193,21 +2196,21 @@ /* Latin 1 (United States) */ { 1252, 437, "vgaoem.fon", "vgafix.fon", "vgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", @@ -74,7 +102,7 @@ "Fixedsys,238", "System,238", "Courier New,238", "MS Serif,238", "Small Fonts,238", "MS Sans Serif,238", "MS Sans Serif,238", "MS Serif,238", -@@ -2218,7 +2218,7 @@ +@@ -2218,7 +2221,7 @@ /* Cyrillic */ { 1251, 866, "vga866.fon", "vgafixr.fon", "vgasysr.fon", "courer.fon", "serifer.fon", "smaller.fon", "sserifer.fon", @@ -83,7 +111,7 @@ "Fixedsys,204", "System,204", "Courier New,204", "MS Serif,204", "Small Fonts,204", "MS Sans Serif,204", "MS Sans Serif,204", "MS Serif,204", -@@ -2229,7 +2229,7 @@ +@@ -2229,7 +2232,7 @@ /* Greek */ { 1253, 737, "vga869.fon", "vgafixg.fon", "vgasysg.fon", "coureg.fon", "serifeg.fon", "smalleg.fon", "sserifeg.fon", @@ -92,7 +120,7 @@ "Fixedsys,161", "System,161", "Courier New,161", "MS Serif,161", "Small Fonts,161", "MS Sans Serif,161", "MS Sans Serif,161", "MS Serif,161", -@@ -2240,7 +2240,7 @@ +@@ -2240,7 +2243,7 @@ /* Turkish */ { 1254, 857, "vga857.fon", "vgafixt.fon", "vgasyst.fon", "couret.fon", "serifet.fon", "smallet.fon", "sserifet.fon", @@ -101,7 +129,7 @@ "Fixedsys,162", "System,162", "Courier New,162", "MS Serif,162", "Small Fonts,162", "MS Sans Serif,162", "MS Sans Serif,162", "MS Serif,162", -@@ -2251,7 +2251,7 @@ +@@ -2251,7 +2254,7 @@ /* Hebrew */ { 1255, 862, "vgaoem.fon", "vgaf1255.fon", "vgas1255.fon", "coue1255.fon", "sere1255.fon", "smae1255.fon", "ssee1255.fon", @@ -110,7 +138,7 @@ "Fixedsys,177", "System,177", "Courier New,177", "MS Serif,177", "Small Fonts,177", "MS Sans Serif,177", "MS Sans Serif,177", "MS Serif,177", -@@ -2260,7 +2260,7 @@ +@@ -2260,7 +2263,7 @@ /* Arabic */ { 1256, 720, "vgaoem.fon", "vgaf1256.fon", "vgas1256.fon", "coue1256.fon", "sere1256.fon", "smae1256.fon", "ssee1256.fon", @@ -119,7 +147,7 @@ "Fixedsys,178", "System,178", "Courier New,178", "MS Serif,178", "Small Fonts,178", "MS Sans Serif,178", "MS Sans Serif,178", "MS Serif,178", -@@ -2269,7 +2269,7 @@ +@@ -2269,7 +2272,7 @@ /* Baltic */ { 1257, 775, "vga775.fon", "vgaf1257.fon", "vgas1257.fon", "coue1257.fon", "sere1257.fon", "smae1257.fon", "ssee1257.fon", @@ -128,7 +156,7 @@ "Fixedsys,186", "System,186", "Courier New,186", "MS Serif,186", "Small Fonts,186", "MS Sans Serif,186", "MS Sans Serif,186", "MS Serif,186", -@@ -2280,14 +2280,14 @@ +@@ -2280,14 +2283,14 @@ /* Vietnamese */ { 1258, 1258, "vga850.fon", "vgafix.fon", "vgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", @@ -145,7 +173,7 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, { 0 }, { 0 }, { 0 } }, -@@ -2325,7 +2325,7 @@ +@@ -2325,7 +2328,7 @@ { Lucida_Sans_Unicode, Microsoft_Sans_Serif, @@ -154,7 +182,7 @@ }; static const struct font_links_defaults_list -@@ -2337,7 +2337,7 @@ +@@ -2337,7 +2340,7 @@ } font_links_defaults_list[] = { /* Non East-Asian */ @@ -163,21 +191,14 @@ { MS_UI_Gothic, SimSun, Gulim, PMingLiU, NULL } }, /* Below lists are courtesy of ---- tools/wine.inf.in.orig 2010-05-26 07:41:44.000000000 +0200 -+++ tools/wine.inf.in 2010-05-26 07:46:15.000000000 +0200 -@@ -576,13 +576,14 @@ - HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162" - HKLM,%FontSubStr%,"Helv",,"MS Sans Serif" - HKLM,%FontSubStr%,"Helvetica",,"Arial" --HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma" -+HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Liberation Sans" - HKLM,%FontSubStr%,"Times",,"Times New Roman" - HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186" - HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238" - HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204" - HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161" - HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162" -+HKLM,%FontSubStr%,"MS Sans Serif",,"Liberation Serif" - HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060 +@@ -2399,8 +2402,8 @@ + static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl) + { + RegSetValueExA(hkey, "Courier", 0, REG_SZ, (const BYTE *)fl->courier, strlen(fl->courier)+1); +- RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)fl->serif, strlen(fl->serif)+1); +- RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)fl->sserif, strlen(fl->sserif)+1); ++ RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)liberationserif, strlen(liberationserif)+1); ++ RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)liberationsans, strlen(liberationsans)+1); + RegSetValueExA(hkey, "Small Fonts", 0, REG_SZ, (const BYTE *)fl->small, strlen(fl->small)+1); + } - [MCI] diff --git a/wine.spec b/wine.spec index 5f30c0d..848417b 100644 --- a/wine.spec +++ b/wine.spec @@ -1,13 +1,13 @@ %define no64bit 0 Name: wine Version: 1.2.0 -Release: 0.7.rc7%{?dist} +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-rc7.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -108,11 +108,16 @@ BuildRequires: dbus-devel hal-devel BuildRequires: gnutls-devel BuildRequires: pulseaudio-libs-devel BuildRequires: gsm-devel -BuildRequires: openal-soft-devel BuildRequires: libv4l-devel BuildRequires: fontpackages-devel -BuildRequires: icoutils BuildRequires: ImageMagick-devel + +%if 0%{?fedora} > 9 +BuildRequires: icoutils +BuildRequires: openal-soft-devel +%endif + + Requires: wine-desktop = %{version}-%{release} Requires: wine-fonts = %{version}-%{release} @@ -402,6 +407,7 @@ Requires: wine-core = %{version}-%{release} %description oss This package adds an oss driver for wine. +%if 0%{?fedora} > 9 %package openal Summary: Openal support for wine Group: System Environment/Libraries @@ -409,10 +415,10 @@ Requires: wine-core = %{version}-%{release} %description openal This package adds an openal driver for wine. - +%endif %prep -%setup -q -n %{name}-1.2-rc7 +%setup -q -n %{name}-1.2 %patch1 %patch100 @@ -464,7 +470,8 @@ install -p -m 644 %{SOURCE201} \ %{buildroot}%{_datadir}/desktop-directories/Wine.directory -# install desktop files +# extract and install icons +%if 0%{?fedora} > 9 mkdir -p %{buildroot}%{_datadir}/pixmaps icotool -x --width=32 --height=32 --bit-depth=32 -o dlls/user32/resources/ \ dlls/user32/resources/oic_winlogo.ico @@ -475,60 +482,74 @@ icotool -x --width=32 --height=32 --bit-depth=32 -o programs/notepad/ \ programs/notepad/notepad.ico install -p -m 644 programs/notepad/notepad*png \ %{buildroot}%{_datadir}/pixmaps/notepad.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE100} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/regedit/ \ programs/regedit/regedit.ico install -p -m 644 programs/regedit/regedit*png \ %{buildroot}%{_datadir}/pixmaps/regedit.png -desktop-file-install \ - --vendor=fedora \ - --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 \ - %{SOURCE102} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winecfg/ \ programs/winecfg/winecfg.ico install -p -m 644 programs/winecfg/winecfg*png \ %{buildroot}%{_datadir}/pixmaps/winecfg.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE103} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winefile/ \ programs/winefile/winefile.ico install -p -m 644 programs/winefile/winefile*png \ %{buildroot}%{_datadir}/pixmaps/winefile.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE104} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winemine/ \ programs/winemine/winemine.ico install -p -m 644 programs/winemine/winemine*png \ %{buildroot}%{_datadir}/pixmaps/winemine.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE105} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winhlp32/ \ programs/winhlp32/winhelp.ico install -p -m 644 programs/winhlp32/winhelp*png \ %{buildroot}%{_datadir}/pixmaps/winhelp.png + +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/wordpad/ \ + programs/wordpad/wordpad.ico +install -p -m 644 programs/wordpad/wordpad*png \ + %{buildroot}%{_datadir}/pixmaps/wordpad.png +%endif + +# install desktop files +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE100} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE101} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE102} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE103} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE104} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE105} + desktop-file-install \ --vendor=fedora \ --dir=%{buildroot}%{_datadir}/applications \ @@ -539,10 +560,6 @@ desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE107} -icotool -x --width=32 --height=32 --bit-depth=32 -o programs/wordpad/ \ - programs/wordpad/wordpad.ico -install -p -m 644 programs/wordpad/wordpad*png \ - %{buildroot}%{_datadir}/pixmaps/wordpad.png desktop-file-install \ --vendor=fedora \ --dir=%{buildroot}%{_datadir}/applications \ @@ -661,8 +678,10 @@ update-desktop-database &>/dev/null || : %post oss -p /sbin/ldconfig %postun oss -p /sbin/ldconfig +%if 0%{?fedora} > 9 %post openal -p /sbin/ldconfig %postun openal -p /sbin/ldconfig +%endif %files %defattr(-,root,root,-) @@ -1120,7 +1139,6 @@ update-desktop-database &>/dev/null || : %{_datadir}/wine/generic.ppd %{_datadir}/wine/wine.inf %{_datadir}/wine/l_intl.nls -%{_datadir}/pixmaps/*png %files fonts %defattr(-,root,root,-) @@ -1178,7 +1196,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/desktop-directories/Wine.directory %{_sysconfdir}/xdg/menus/applications-merged/wine.menu %{_initrddir}/wine + +%if 0%{?fedora} > 9 %{_datadir}/pixmaps/*png +%endif # esd subpackage %files esd @@ -1259,11 +1280,21 @@ update-desktop-database &>/dev/null || : %defattr(-,root,root,-) %{_libdir}/wine/wineoss.drv.so +%if 0%{?fedora} > 9 %files openal %defattr(-,root,root,-) %{_libdir}/wine/openal32.dll.so +%endif %changelog +* Fri Jul 16 2010 Andreas Bierfert +- 1.2-1 +- final release + +* Fri Jul 16 2010 Andreas Bierfert +- 1.2-0.8.rc7 +- improve font patch + * Sun Jul 11 2010 Andreas Bierfert - 1.2-0.7.rc7 - version upgrade From 9acc3ebad8d46c8054cac6fda157d8d592a706e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:19:36 +0000 Subject: [PATCH 13/16] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 15e51e7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wine -# $Id: Makefile,v 1.4 2006/01/02 08:55:16 awjb Exp $ -NAME := wine -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index bb8668c..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -wine-1_1_15-3_fc11:HEAD:wine-1.1.15-3.fc11.src.rpm:1237145709 From be43027c268c458dd53ad6c211b67cf99e6e85a4 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 30 Jul 2010 10:33:57 +0200 Subject: [PATCH 14/16] * Wed Jul 28 2010 Andreas Bierfert - 1.2.0-2 - fix segfault (#617968) - enable openal-soft on el6 --- wine-preloader-segfault.patch | 11 +++++++++++ wine.spec | 30 ++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 wine-preloader-segfault.patch diff --git a/wine-preloader-segfault.patch b/wine-preloader-segfault.patch new file mode 100644 index 0000000..8988d24 --- /dev/null +++ b/wine-preloader-segfault.patch @@ -0,0 +1,11 @@ +--- 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 848417b..5f8f818 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ %define no64bit 0 Name: wine Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -37,7 +37,8 @@ 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 @@ -112,11 +113,14 @@ BuildRequires: libv4l-devel BuildRequires: fontpackages-devel BuildRequires: ImageMagick-devel -%if 0%{?fedora} > 9 -BuildRequires: icoutils +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildRequires: openal-soft-devel %endif +%if 0%{?fedora} >= 10 +BuildRequires: icoutils +%endif + Requires: wine-desktop = %{version}-%{release} Requires: wine-fonts = %{version}-%{release} @@ -228,7 +232,7 @@ Requires: wine-marlett-fonts = %{version}-%{release} Requires: wine-symbol-fonts = %{version}-%{release} # intermediate fix for #593140 Requires: liberation-sans-fonts liberation-serif-fonts liberation-mono-fonts -%if 0%{?fedora} > 12 || 0%{?rhel} > 6 +%if 0%{?fedora} > 12 Requires: liberation-narrow-fonts %endif @@ -407,7 +411,7 @@ Requires: wine-core = %{version}-%{release} %description oss This package adds an oss driver for wine. -%if 0%{?fedora} > 9 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %package openal Summary: Openal support for wine Group: System Environment/Libraries @@ -422,6 +426,7 @@ This package adds an openal driver for wine. %patch1 %patch100 +%patch101 -p1 %patch200 %patch400 -p1 %patch401 -p1 @@ -471,7 +476,7 @@ install -p -m 644 %{SOURCE201} \ # extract and install icons -%if 0%{?fedora} > 9 +%if 0%{?fedora} > 10 mkdir -p %{buildroot}%{_datadir}/pixmaps icotool -x --width=32 --height=32 --bit-depth=32 -o dlls/user32/resources/ \ dlls/user32/resources/oic_winlogo.ico @@ -678,7 +683,7 @@ update-desktop-database &>/dev/null || : %post oss -p /sbin/ldconfig %postun oss -p /sbin/ldconfig -%if 0%{?fedora} > 9 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %post openal -p /sbin/ldconfig %postun openal -p /sbin/ldconfig %endif @@ -1197,7 +1202,7 @@ update-desktop-database &>/dev/null || : %{_sysconfdir}/xdg/menus/applications-merged/wine.menu %{_initrddir}/wine -%if 0%{?fedora} > 9 +%if 0%{?fedora} >= 10 %{_datadir}/pixmaps/*png %endif @@ -1280,13 +1285,18 @@ update-desktop-database &>/dev/null || : %defattr(-,root,root,-) %{_libdir}/wine/wineoss.drv.so -%if 0%{?fedora} > 9 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %files openal %defattr(-,root,root,-) %{_libdir}/wine/openal32.dll.so %endif %changelog +* Wed Jul 28 2010 Andreas Bierfert +- 1.2.0-2 +- fix segfault (#617968) +- enable openal-soft on el6 + * Fri Jul 16 2010 Andreas Bierfert - 1.2-1 - final release From 31d92e23e83c62433c538647e301710b101cabfc Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Tue, 17 Aug 2010 13:57:57 +0200 Subject: [PATCH 15/16] - 1.3.0-1 - version upgrade --- .gitignore | 1 + sources | 2 +- wine-gecko.patch | 6 +++--- wine-preloader-segfault.patch | 11 ----------- wine.spec | 19 +++++++++++-------- 5 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 wine-preloader-segfault.patch 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) From c950f73ee42a60296b704d2625e37105037cfff6 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Tue, 17 Aug 2010 14:24:30 +0200 Subject: [PATCH 16/16] - add rundll.exe16.so to 32bit file section --- wine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wine.spec b/wine.spec index e885790..0a17ff4 100644 --- a/wine.spec +++ b/wine.spec @@ -1050,6 +1050,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/mmdevldr.vxd.so %{_libdir}/wine/monodebg.vxd.so +%{_libdir}/wine/rundll.exe16.so %{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/user.exe16.so %{_libdir}/wine/vmm.vxd.so