From 0e7acd2a7b39a6e62fbdd5ce25c1cb613dc9b4c1 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Sat, 19 Mar 2011 16:15:18 +0100 Subject: [PATCH] 1.3.16-1 version upgrade cleanup unneeded patches drop some patches reenable smp build --- .gitignore | 1 + sources | 2 +- wine-chooser.sh | 39 ---- wine-fonts.patch | 204 ------------------ wine-gecko.patch | 127 ----------- wine.spec | 46 ++-- ...tch => winepulse-configure.ac-1.3.16.patch | 16 +- 7 files changed, 25 insertions(+), 410 deletions(-) delete mode 100644 wine-chooser.sh delete mode 100644 wine-fonts.patch delete mode 100644 wine-gecko.patch rename winepulse-configure.ac-1.3.10.patch => winepulse-configure.ac-1.3.16.patch (84%) diff --git a/.gitignore b/.gitignore index 0a55d95..9e739e4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /wine-1.3.13.tar.bz2 /wine-1.3.14.tar.bz2 /wine-1.3.15.tar.bz2 +/wine-1.3.16.tar.bz2 diff --git a/sources b/sources index 6834662..e38e8c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ddc07f0a1c7b05f4cf52292aafc98e3 wine-1.3.15.tar.bz2 +74627787556240473a85daaf51d4f620 wine-1.3.16.tar.bz2 diff --git a/wine-chooser.sh b/wine-chooser.sh deleted file mode 100644 index d14f58a..0000000 --- a/wine-chooser.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -HAVE_32=false -HAVE_64=false - -if [ -x "/usr/bin/wine32" ]; then -HAVE_32=true -fi - -if [ -x "/usr/bin/wine64" ]; then -HAVE_64=true -fi - -if [ -f "${1}" ]; then - archtype=`file "${1}" | cut -d':' -f2 | cut -d' ' -f2` - - if [ ${archtype} = 'PE32+' ]; then # 64bit - if $HAVE_64; then - exec "/usr/bin/wine64" "${@}"; - elif [ `uname -m` = 'x86_64' ]; then - echo "Your are trying to run a 64bit application. Please install the 64bit version of wine." - echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-64)\\\"\"'" - else - echo "Your are trying to run a 64bit application on a 32bit installation of Fedora. You need a 64bit version of Fedora to run this application." - fi - else - if $HAVE_32; then - exec "/usr/bin/wine32" "${@}" - else - echo "Your are trying to run a 32bit application. Please install the 32bit version of wine." - echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-32)\\\"\"'" - fi - fi -else - if $HAVE_64; then - exec "/usr/bin/wine64" "${@}"; - else - exec "/usr/bin/wine32" "${@}"; - fi -fi diff --git a/wine-fonts.patch b/wine-fonts.patch deleted file mode 100644 index 72385ae..0000000 --- a/wine-fonts.patch +++ /dev/null @@ -1,204 +0,0 @@ ---- 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-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}; - 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}; -@@ -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; -- 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 +1726,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 +2196,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 +2221,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 +2232,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 +2243,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 +2254,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 +2263,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 +2272,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 +2283,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 +2328,7 @@ - { - Lucida_Sans_Unicode, - Microsoft_Sans_Serif, -- Tahoma -+ Liberation - }; - - static const struct font_links_defaults_list -@@ -2337,7 +2340,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 -@@ -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); - } - diff --git a/wine-gecko.patch b/wine-gecko.patch deleted file mode 100644 index 03d574d..0000000 --- a/wine-gecko.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- 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-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 -+IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 shell32 - EXTRADEFS = -DCOM_NO_WINDOWS_H - DELAYIMPORTS = wininet - diff --git a/wine.spec b/wine.spec index 52457b8..be82bda 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ %define no64bit 0 Name: wine -Version: 1.3.15 -Release: 3%{?dist} +Version: 1.3.16 +Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -12,7 +12,6 @@ Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf Source5: wine-64.conf -Source6: wine-chooser.sh # desktop stuff Source100: wine-notepad.desktop Source101: wine-regedit.desktop @@ -32,22 +31,16 @@ Source201: wine.directory # mime types Source300: wine-mime-msi.desktop -Patch1: wine-rpath.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 -Patch400: http://art.ified.ca/downloads/winepulse/winepulse-configure.ac-1.3.10.patch +Patch400: http://art.ified.ca/downloads/winepulse/winepulse-configure.ac-1.3.16.patch Patch401: http://art.ified.ca/downloads/winepulse/winepulse-0.39.patch Patch402: http://art.ified.ca/downloads/winepulse/winepulse-winecfg-1.3.11.patch Source402: README-FEDORA-PULSEAUDIO -# enhancements -# add wine-gecko support -Patch1000: wine-gecko.patch - Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if !%{?no64bit} @@ -174,6 +167,9 @@ Obsoletes: wine <= 0.9.15-1%{?dist} Obsoletes: wine-arts < 0.9.34 Obsoletes: wine-tools <= 1.1.27 Provides: wine-tools = %{version}-%{release} +# removed as of 1.3.16 +Obsoletes: wine-nas <= 1.3.15 +Provides: wine-nas = %{version}-%{release} # require -common so we get wine.inf (#528335) Requires: wine-common = %{version}-%{release} # fix dns resolution (#492700) @@ -195,7 +191,6 @@ Requires: libXrender(x86-64) Requires: libXcursor(x86-64) %endif - %description core Wine core package includes the basic wine stuff needed by all other packages. @@ -346,14 +341,6 @@ Requires: jack-audio-connection-kit(x86-64) %description jack JACK sound support for wine -%package nas -Summary: NAS sound support for wine -Group: System Environment/Libraries -Requires: wine-core = %{version}-%{release} - -%description nas -NAS sound support for wine - %package ldap Summary: LDAP support for wine Group: System Environment/Libraries @@ -433,7 +420,7 @@ This package adds an openal driver for wine. %prep %setup -q -%patch1 -b .rpath +#%patch1 -b .rpath %patch200 -b .imagemagick %patch400 -p1 -b .winepulse %patch401 -p1 -b .winepulse @@ -457,7 +444,7 @@ export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno --enable-maintainer-mode \ --disable-tests -%{__make} TARGETFLAGS="" #%{?_smp_mflags} +%{__make} TARGETFLAGS="" %{?_smp_mflags} %install rm -rf %{buildroot} @@ -669,9 +656,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %post jack -p /sbin/ldconfig %postun jack -p /sbin/ldconfig -%post nas -p /sbin/ldconfig -%postun nas -p /sbin/ldconfig - %post ldap -p /sbin/ldconfig %postun ldap -p /sbin/ldconfig @@ -935,6 +919,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/wine/msi.dll.so %{_libdir}/wine/msimtf.dll.so %{_libdir}/wine/msimg32.dll.so +%{_libdir}/wine/msimsg.dll.so %{_libdir}/wine/msisip.dll.so %{_libdir}/wine/msisys.ocx.so %{_libdir}/wine/msnet32.dll.so @@ -1051,7 +1036,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/wine/wer.dll.so %{_libdir}/wine/wiaservc.dll.so %{_libdir}/wine/windowscodecs.dll.so -%{_libdir}/wine/winecoreaudio.drv.so %{_libdir}/wine/winegstreamer.dll.so %{_libdir}/wine/winejoystick.drv.so %{_libdir}/wine/winemapi.dll.so @@ -1267,11 +1251,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_libdir}/wine/winejack.drv.so -# nas subpackage -%files nas -%defattr(-,root,root,-) -%{_libdir}/wine/winenas.drv.so - # ldap subpackage %files ldap %defattr(-,root,root,-) @@ -1344,6 +1323,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Mar 18 2011 Andreas Bierfert +- 1.3.16-1 +- version upgrade +- cleanup unneeded patches +- drop some patches +- reenable smp build + * Thu Mar 17 2011 Andreas Bierfert - 1.3.15-3 - reenable fonts diff --git a/winepulse-configure.ac-1.3.10.patch b/winepulse-configure.ac-1.3.16.patch similarity index 84% rename from winepulse-configure.ac-1.3.10.patch rename to winepulse-configure.ac-1.3.16.patch index 65085cf..b44dd57 100644 --- a/winepulse-configure.ac-1.3.10.patch +++ b/winepulse-configure.ac-1.3.16.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index 5e1810f..c941f93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,6 +79,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), +--- wine-1.3.16/configure.ac.winepulse 2011-03-18 20:48:03.000000000 +0100 ++++ wine-1.3.16/configure.ac 2011-03-18 21:28:27.000000000 +0100 +@@ -79,6 +79,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]) @@ -10,7 +8,7 @@ index 5e1810f..c941f93 100644 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]) -@@ -1434,6 +1435,30 @@ then +@@ -1476,6 +1477,30 @@ CFLAGS="$save_CFLAGS" fi @@ -41,8 +39,8 @@ index 5e1810f..c941f93 100644 dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then -@@ -1630,7 +1655,7 @@ dnl **** Check for libodbc **** - WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) +@@ -1672,7 +1697,7 @@ + test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} dnl **** Check for any sound system **** -if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ @@ -50,7 +48,7 @@ index 5e1810f..c941f93 100644 "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" -a \ -@@ -2797,6 +2822,7 @@ WINE_CONFIG_DLL(winenas.drv) +@@ -2849,6 +2874,7 @@ WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv) WINE_CONFIG_DLL(wineps16.drv16,enable_win16)