diff --git a/mingw-wine-gecko.spec b/mingw-wine-gecko.spec index dc83d78..5344ffa 100644 --- a/mingw-wine-gecko.spec +++ b/mingw-wine-gecko.spec @@ -2,7 +2,7 @@ Name: mingw-wine-gecko Version: 2.47 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Gecko library required for Wine License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -91,6 +91,9 @@ sed -i 's,cross_compiling=.*$,cross_compiling=yes,' nsprpub/configure # remove blank includes rm -f media/libstagefright/ports/win32/include/pthread.h +# fix wine cabinet tool +sed -i 's,$WINE cabarc.exe -r -m mszip N $cabfile msi/files,$WINE cabarc.exe -r -m mszip N $cabfile msi/files/*,' wine/make_package + %build cd wine-mozilla-%{version} # setup build options... @@ -101,9 +104,9 @@ echo "export CXXFLAGS=\"\$CFLAGS -fpermissive -mxsave\"" >> wine/mozconfig-commo cp wine/mozconfig-common wine/mozconfig-common.build # ... and build -TOOLCHAIN_PREFIX=i686-w64-mingw32- ./wine/make_package --msi-package -win32 +TOOLCHAIN_PREFIX=i686-w64-mingw32- MAKEOPTS="%{_smp_mflags}" ./wine/make_package --msi-package -win32 -TOOLCHAIN_PREFIX=x86_64-w64-mingw32- ./wine/make_package --msi-package -win64 +TOOLCHAIN_PREFIX=x86_64-w64-mingw32- MAKEOPTS="%{_smp_mflags}" ./wine/make_package --msi-package -win64 %install mkdir -p %{buildroot}%{_datadir}/wine/gecko @@ -125,6 +128,9 @@ install -p -m 0644 wine_gecko-%{version}-x86_64/dist/wine_gecko-%{version}-x86_6 %{_datadir}/wine/gecko/wine_gecko-%{version}-x86_64.msi %changelog +* Thu Nov 07 2019 Michael Cronenworth - 2.47-10 +- Fix cabinet file creation and build options + * Fri Sep 13 2019 Michael Cronenworth - 2.47-9 - Fix FTBFS (RHBZ#1675390)