rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

Accepting request 832825 from Emulators

Browse Source 
- Do not build on armv6
- Regenerate baselib.conf for aarch64 as well, to fix build
- Run fdupes to avoid dups on aarch64 (forwarded request 832823 from Guillaume_G)

OBS-URL: https://build.opensuse.org/request/show/832825
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=316
This commit is contained in:
Dominique Leuenberger 2020-09-08 20:46:50 +00:00 committed by Git OBS Bridge
commit e1b9cfd2ca
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wine.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 7 16:12:39 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Do not build on armv6
-------------------------------------------------------------------
Mon Sep 7 16:10:18 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Regenerate baselib.conf for aarch64 as well, to fix build
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 29 06:05:50 UTC 2020 - Marcus Meissner <meissner@suse.com> Sat Aug 29 06:05:50 UTC 2020 - Marcus Meissner <meissner@suse.com>
@ -30,6 +40,11 @@ Sat Aug 1 13:01:26 UTC 2020 - Marcus Meissner <meissner@suse.com>
- Various bug fixes. - Various bug fixes.
- update staging to 5.14 release - update staging to 5.14 release
-------------------------------------------------------------------
Wed Jul 22 12:53:01 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Run fdupes to avoid dups on aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 18 06:37:58 UTC 2020 - Marcus Meissner <meissner@suse.com> Sat Jul 18 06:37:58 UTC 2020 - Marcus Meissner <meissner@suse.com>

6
wine.spec
View File

@ -155,7 +155,7 @@ Requires: samba-winbind
Requires: %{name}-32bit = %{version} Requires: %{name}-32bit = %{version}
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64 ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64
%if %{staging} %if %{staging}
# upstream patch target version # upstream patch target version
%define staging_version 5.16 %define staging_version 5.16
@ -274,7 +274,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
grep "have_x=yes" config.log || exit 1 grep "have_x=yes" config.log || exit 1
# generate baselibs.conf # generate baselibs.conf
%ifarch %ix86 %ifarch %ix86 aarch64
echo "# autogenerated in .spec file" >%SOURCE7 echo "# autogenerated in .spec file" >%SOURCE7
echo "%name" >> %SOURCE7 echo "%name" >> %SOURCE7
echo " +^/usr/bin/wine\$" >> %SOURCE7 echo " +^/usr/bin/wine\$" >> %SOURCE7
@ -376,6 +376,8 @@ chmod 755 %winedir/my-find-requires.sh
# breaks btrfs installation, see bnc#723402 # breaks btrfs installation, see bnc#723402
# %%fdupes -s %{buildroot} # %%fdupes -s %{buildroot}
# Fix dups on aarch64
%fdupes -s %{buildroot}%{_libdir}/wine/fakedlls
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig