diff --git a/wine.changes b/wine.changes index 37664d6..645fcc7 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 7 16:12:39 UTC 2020 - Guillaume GARDET + +- Do not build on armv6 + +------------------------------------------------------------------- +Mon Sep 7 16:10:18 UTC 2020 - Guillaume GARDET + +- Regenerate baselib.conf for aarch64 as well, to fix build + ------------------------------------------------------------------- Sat Aug 29 06:05:50 UTC 2020 - Marcus Meissner @@ -30,6 +40,11 @@ Sat Aug 1 13:01:26 UTC 2020 - Marcus Meissner - Various bug fixes. - update staging to 5.14 release +------------------------------------------------------------------- +Wed Jul 22 12:53:01 UTC 2020 - Guillaume GARDET + +- Run fdupes to avoid dups on aarch64 + ------------------------------------------------------------------- Sat Jul 18 06:37:58 UTC 2020 - Marcus Meissner diff --git a/wine.spec b/wine.spec index 26d63d3..f119917 100644 --- a/wine.spec +++ b/wine.spec @@ -155,7 +155,7 @@ Requires: samba-winbind Requires: %{name}-32bit = %{version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64 +ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64 %if %{staging} # upstream patch target version %define staging_version 5.16 @@ -274,7 +274,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ grep "have_x=yes" config.log || exit 1 # generate baselibs.conf -%ifarch %ix86 +%ifarch %ix86 aarch64 echo "# autogenerated in .spec file" >%SOURCE7 echo "%name" >> %SOURCE7 echo " +^/usr/bin/wine\$" >> %SOURCE7 @@ -376,6 +376,8 @@ chmod 755 %winedir/my-find-requires.sh # breaks btrfs installation, see bnc#723402 # %%fdupes -s %{buildroot} +# Fix dups on aarch64 +%fdupes -s %{buildroot}%{_libdir}/wine/fakedlls %post -p /sbin/ldconfig %postun -p /sbin/ldconfig