Index: SPECS/wine-gecko.spec===================================================================--- SPECS/wine-gecko.spec (revision 93513)+++ SPECS/wine-gecko.spec (working copy)@@ -1,12 +1,13 @@ %define name wine-gecko %define oname wine-mozilla-%define version 1.1.0-%define rel 2+%define version 1.2.0+%define rel 1 # random working revision from mingw-w64 trunk:-%define mingw64_snap 2847+%define mingw64_snap 4156 # not working due to various errors:+# - 2847 ('swprintf_s' was not declared in this scope" while building mozilla) # - 3272 (crt build failure) # - 3500 (redefinition of UINT8 while building mozilla) # - 3713 (crt build failure)@@ -30,7 +31,6 @@ Source1: mingw-w64-headers-svn%mingw64_snap.tar.bz2 Source2: mingw-w64-crt-svn%mingw64_snap.tar.bz2 # We would need a mingw64 crosscompiler for a 64-bit binary.-# NOTE: building this package as-is on x86_64 will build a 32-bit binary instead. ExclusiveArch: %ix86 Requires: wine32 BuildRequires: mingw32-gcc@@ -40,8 +40,6 @@ BuildRequires: glib2-devel BuildRequires: libIDL-devel BuildRequires: x11-proto-devel-# lcab creates cabs without compression, but it is better than nothing-BuildRequires: lcab %description A custom version of Mozilla's Gecko Layout Engine for Wine. This package@@ -50,7 +48,12 @@ %prep %setup -q -c -a1 -a2+ln -s wine-mozilla-%version wine-mozilla+for file in wine-mozilla/wine/mozconfig-win*; do+ echo "ac_add_options --target=%_mingw32_host" >> $file+done+ %build # disabled as build fails due to various issues if set: # %%_mingw32_env@@ -79,20 +82,17 @@ export ac_cv___stdcall=false cd wine-mozilla-cp -af wine/mozconfig wine/mozconfig-mga-echo "ac_add_options --target=%_mingw32_host" >> wine/mozconfig-mga-export MOZCONFIG=$PWD/wine/mozconfig-mga+wine/make_package \+%ifarch x86_64+ -win64+%else+ -win32+%endif-%make -f client.mk build-wine/make_package ../wine_gecko-cd ../wine_gecko/dist--lcab -r wine_gecko ../../wine_gecko-%{version}-x86.cab- %install rm -rf %{buildroot} install -d -m755 %{buildroot}%{_datadir}/wine/gecko-install -m644 wine_gecko-%{version}-x86.cab %{buildroot}%{_datadir}/wine/gecko+install -m644 wine_gecko-*/dist/wine_gecko/wine_gecko-%{version}-*.msi %{buildroot}%{_datadir}/wine/gecko %clean rm -rf %{buildroot}@@ -103,4 +103,4 @@ %doc wine-mozilla/LICENSE %doc wine-mozilla/toolkit/content/license.html %dir %{_datadir}/wine/gecko-%{_datadir}/wine/gecko/*.cab+%{_datadir}/wine/gecko/*.msi