diff --git a/baselibs.conf b/baselibs.conf index 6775308..ea7cd05 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,6 +2,20 @@ wine +^/usr/bin/wine$ +^/usr/bin/wine-preloader$ + /usr/lib/wine/*.acm + /usr/lib/wine/*.com + /usr/lib/wine/*.cpl + /usr/lib/wine/*.dll + /usr/lib/wine/*.dll16 + /usr/lib/wine/*.drv + /usr/lib/wine/*.drv16 + /usr/lib/wine/*.exe + /usr/lib/wine/*.exe16 + /usr/lib/wine/*.mod16 + /usr/lib/wine/*.ocx + /usr/lib/wine/*.sys + /usr/lib/wine/*.tlb + /usr/lib/wine/*.vxd requires "libX11.so.6" requires "libXext.so.6" requires "libXcursor.so.1" diff --git a/wine.changes b/wine.changes index b6aba00..2b6404a 100644 --- a/wine.changes +++ b/wine.changes @@ -7,6 +7,7 @@ Wed Jan 22 06:53:38 UTC 2020 - Marcus Meissner - XAudio2 reimplementation. - Vulkan 1.1 support. - update staging to 5.0 release +- build the PE format modules with the MingW cross compiler. ------------------------------------------------------------------- Sun Jan 19 10:22:06 UTC 2020 - Marcus Meissner diff --git a/wine.spec b/wine.spec index b273553..c42cc83 100644 --- a/wine.spec +++ b/wine.spec @@ -92,6 +92,12 @@ BuildRequires: pkgconfig BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel +%ifarch x86_64 +BuildRequires: mingw64-cross-gcc +%endif +%ifarch %ix86 +BuildRequires: mingw32-cross-gcc +%endif BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) @@ -271,6 +277,7 @@ echo "%name" >> %SOURCE7 echo " +^/usr/bin/wine\$" >> %SOURCE7 echo " +^/usr/bin/wine-preloader\$" >> %SOURCE7 echo " +^/usr/lib/wine/fakedlls" >> %SOURCE7 +echo " +^/usr/lib/wine/*" >> %SOURCE7 grep SONAME_ config.log grep SONAME_ config.log|grep -v 'so"'|sed -e 's/^.*\(".*"\).*$/ requires \1/;'|sort -u >>%SOURCE7 echo " recommends \"libpulse0-32bit\"" >> %SOURCE7 @@ -436,6 +443,22 @@ chmod 755 %winedir/my-find-requires.sh %{_bindir}/wine64-preloader %endif %{_libdir}/wine/*.so +%{_libdir}/wine/*.acm +%{_libdir}/wine/*.com +%{_libdir}/wine/*.cpl +%{_libdir}/wine/*.dll +%ifarch %ix86 +%{_libdir}/wine/*.dll16 +%{_libdir}/wine/*.drv16 +%{_libdir}/wine/*.exe16 +%{_libdir}/wine/*.mod16 +%{_libdir}/wine/*.vxd +%endif +%{_libdir}/wine/*.drv +%{_libdir}/wine/*.exe +%{_libdir}/wine/*.ocx +%{_libdir}/wine/*.sys +%{_libdir}/wine/*.tlb %{_libdir}/lib*.so.* %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls