From fe15abae8b44c64d88082bea410bd1a0cfc4abee411d67ba6f462630df81ba84 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 23 May 2021 13:44:38 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=846 --- wine.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wine.spec b/wine.spec index 93e011a..905e902 100644 --- a/wine.spec +++ b/wine.spec @@ -315,6 +315,12 @@ make %{?_smp_mflags} all %install make install DESTDIR=%{buildroot} + +%ifarch x86_64 +ln -s /usr/lib/wine/i386-windows %buildroot/usr/%_lib/wine/ +ln -s /usr/lib/wine/i386-unix %buildroot/usr/%_lib/wine/ +%endif + # install desktop file install -d %{buildroot}%{_datadir}/applications/ %suse_update_desktop_file %{SOURCE4} System Emulator From 1446b89e17ac62402019998339c9eff51a88cda3a9e49af19a346a568ff485b1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 24 May 2021 13:55:29 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=848 --- wine.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wine.spec b/wine.spec index 905e902..9be2943 100644 --- a/wine.spec +++ b/wine.spec @@ -440,6 +440,10 @@ chmod 755 %winedir/my-find-requires.sh %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps %{_datadir}/icons/hicolor/scalable/apps/*.svg +%ifarch x86_64 +%ghost %dir /usr/lib/wine/i386-windows +%ghost %dir /usr/lib/wine/i386-unix +%endif %ifarch %ix86 %{_bindir}/wine %{_bindir}/wine-preloader From 178c488b2b78189a87d30e442da0b1ebb515d9aa567bd642e1051521108bf5e8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 24 May 2021 16:37:13 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=849 --- wine.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/wine.spec b/wine.spec index 9be2943..2a5daac 100644 --- a/wine.spec +++ b/wine.spec @@ -317,8 +317,13 @@ make %{?_smp_mflags} all make install DESTDIR=%{buildroot} %ifarch x86_64 -ln -s /usr/lib/wine/i386-windows %buildroot/usr/%_lib/wine/ -ln -s /usr/lib/wine/i386-unix %buildroot/usr/%_lib/wine/ +mkdir -p \ + %{buildroot}/usr/lib/wine/i386-windows \ + %{buildroot}/usr/lib/wine/i386-unix +ln -s \ + /usr/lib/wine/i386-windows \ + /usr/lib/wine/i386-unix \ + %buildroot/usr/%_lib/wine/ %endif # install desktop file @@ -440,10 +445,6 @@ chmod 755 %winedir/my-find-requires.sh %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps %{_datadir}/icons/hicolor/scalable/apps/*.svg -%ifarch x86_64 -%ghost %dir /usr/lib/wine/i386-windows -%ghost %dir /usr/lib/wine/i386-unix -%endif %ifarch %ix86 %{_bindir}/wine %{_bindir}/wine-preloader @@ -462,6 +463,10 @@ chmod 755 %winedir/my-find-requires.sh %{_libdir}/wine/*-windows/*.acm %dir %{_libdir}/wine/*-unix %{_libdir}/wine/*-unix/*.so* +%ifarch x86_64 +%dir /usr/lib/wine/i386-windows +%dir /usr/lib/wine/i386-unix +%endif %files devel %defattr(-,root,root) From b948165be56956ab65f154f4c31715b574d5c73bafc6e25241ef650e22d4176f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 25 May 2021 15:37:12 +0000 Subject: [PATCH 4/5] Accepting request 895387 from home:darix:branches:Emulators fix filelist OBS-URL: https://build.opensuse.org/request/show/895387 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=850 --- wine.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wine.spec b/wine.spec index 2a5daac..f8076c4 100644 --- a/wine.spec +++ b/wine.spec @@ -455,6 +455,11 @@ chmod 755 %winedir/my-find-requires.sh %ifarch x86_64 aarch64 %{_bindir}/wine64 %{_bindir}/wine64-preloader +%dir /usr/lib/wine/ +%dir /usr/lib/wine/i386-windows +%dir /usr/lib/wine/i386-unix +/usr/%{_lib}/wine/i386-windows +/usr/%{_lib}/wine/i386-unix %endif %dir %{_libdir}/wine %dir %{_libdir}/wine/*-windows @@ -463,10 +468,6 @@ chmod 755 %winedir/my-find-requires.sh %{_libdir}/wine/*-windows/*.acm %dir %{_libdir}/wine/*-unix %{_libdir}/wine/*-unix/*.so* -%ifarch x86_64 -%dir /usr/lib/wine/i386-windows -%dir /usr/lib/wine/i386-unix -%endif %files devel %defattr(-,root,root) From b0820a70a729787bc3711b2b2c4f8bd98d9de19b46ff51fa5ab738a76e2a6bfe Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 25 May 2021 15:46:52 +0000 Subject: [PATCH 5/5] - adjusted directories to load 32bit wine things from 64bit wine. OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=851 --- wine.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wine.changes b/wine.changes index d0e61b1..5cb1e2c 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 15:46:28 UTC 2021 - Marcus Meissner + +- adjusted directories to load 32bit wine things from 64bit wine. + ------------------------------------------------------------------- Sat May 22 11:22:31 UTC 2021 - Marcus Meissner