From 3e65c191cf2d8e54cb24b2b13c7a9dc3480950468cfe5e585d67c5ba81a5d63a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 20 Aug 2012 13:15:34 +0000 Subject: [PATCH 1/2] Accepting request 131224 from openSUSE:Factory:ARM - fix build on ARM OBS-URL: https://build.opensuse.org/request/show/131224 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=156 --- wine.changes | 5 +++++ wine.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/wine.changes b/wine.changes index faf49b6..5a703e7 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 20 11:27:40 UTC 2012 - dmueller@suse.com + +- fix build on ARM + ------------------------------------------------------------------- Mon Jun 11 20:30:12 UTC 2012 - meissner@suse.com diff --git a/wine.spec b/wine.spec index f49ec77..1afc176 100644 --- a/wine.spec +++ b/wine.spec @@ -45,7 +45,9 @@ BuildRequires: libxslt-devel BuildRequires: ncurses-devel BuildRequires: openal-soft-devel BuildRequires: openldap2-devel +%ifarch %{ix86} alpha sparc sparc64 s390 s390x x86_64 ppc ppc64 BuildRequires: prelink +%endif BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel @@ -251,6 +253,9 @@ chmod 755 %winedir/my-find-requires.sh %{_bindir}/wine %{_bindir}/wine-preloader %endif +%ifarch %arm +%{_bindir}/wine +%endif %ifarch ppc %{_bindir}/wine %endif From 51de88851e9717bf25b9135fe372a61eb825a32392f67f696eeb5bacfce86338 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 21 Aug 2012 09:46:24 +0000 Subject: [PATCH 2/2] - package bin/wine on %arm - prelink is only needed for %ix86 and x86_64 (win32 and win64) (not yet for ARM) OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=157 --- wine.changes | 4 +++- wine.spec | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wine.changes b/wine.changes index 5a703e7..2c9a001 100644 --- a/wine.changes +++ b/wine.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- Mon Aug 20 11:27:40 UTC 2012 - dmueller@suse.com -- fix build on ARM +- package bin/wine on %arm +- prelink is only needed for %ix86 and x86_64 (win32 and win64) + (not yet for ARM) ------------------------------------------------------------------- Mon Jun 11 20:30:12 UTC 2012 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 1afc176..c177988 100644 --- a/wine.spec +++ b/wine.spec @@ -45,7 +45,8 @@ BuildRequires: libxslt-devel BuildRequires: ncurses-devel BuildRequires: openal-soft-devel BuildRequires: openldap2-devel -%ifarch %{ix86} alpha sparc sparc64 s390 s390x x86_64 ppc ppc64 +%ifarch %{ix86} x86_64 +# only used on win32 and win64 today BuildRequires: prelink %endif BuildRequires: sane-backends-devel @@ -253,10 +254,7 @@ chmod 755 %winedir/my-find-requires.sh %{_bindir}/wine %{_bindir}/wine-preloader %endif -%ifarch %arm -%{_bindir}/wine -%endif -%ifarch ppc +%ifarch ppc %arm %{_bindir}/wine %endif %ifarch x86_64