From 3409cbbef06c7d28403da0b525dda09108fb0547 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 5 Aug 2019 22:59:02 -0500 Subject: [PATCH] Include CPU arch in alternatives names on d3d dlls --- wine.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/wine.spec b/wine.spec index 7ec2bd2..47f000d 100644 --- a/wine.spec +++ b/wine.spec @@ -1013,15 +1013,15 @@ fi %endif %endif %{_sbindir}/alternatives --install %{_libdir}/wine/dxgi.dll.so \ - wine-dxgi %{_libdir}/wine/wine-dxgi.dll.so 10 + wine-dxgi%{?_isa} %{_libdir}/wine/wine-dxgi.dll.so 10 %{_sbindir}/alternatives --install %{_libdir}/wine/d3d9.%{winedll} \ - wine-d3d9 %{_libdir}/wine/wine-d3d9.%{winedll} 10 + wine-d3d9%{?_isa} %{_libdir}/wine/wine-d3d9.%{winedll} 10 %{_sbindir}/alternatives --install %{_libdir}/wine/d3d10.%{winedll} \ - wine-d3d10 %{_libdir}/wine/wine-d3d10.%{winedll} 10 \ + wine-d3d10%{?_isa} %{_libdir}/wine/wine-d3d10.%{winedll} 10 \ --slave %{_libdir}/wine/d3d10_1.%{winedll} wine-d3d10_1 %{_libdir}/wine/wine-d3d10_1.%{winedll} \ --slave %{_libdir}/wine/d3d10core.%{winedll} wine-d3d10core %{_libdir}/wine/wine-d3d10core.%{winedll} %{_sbindir}/alternatives --install %{_libdir}/wine/d3d11.%{winedll} \ - wine-d3d11 %{_libdir}/wine/wine-d3d11.%{winedll} 10 + wine-d3d11%{?_isa} %{_libdir}/wine/wine-d3d11.%{winedll} 10 %postun core %{?ldconfig} @@ -1033,10 +1033,10 @@ if [ $1 -eq 0 ] ; then %{_sbindir}/alternatives --remove wine %{_bindir}/wine32 %{_sbindir}/alternatives --remove wineserver %{_bindir}/wineserver32 %endif - %{_sbindir}/alternatives --remove wine-dxgi %{_libdir}/wine/wine-dxgi.dll.so - %{_sbindir}/alternatives --remove wine-d3d9 %{_libdir}/wine/wine-d3d9.%{winedll} - %{_sbindir}/alternatives --remove wine-d3d10 %{_libdir}/wine/wine-d3d10.%{winedll} - %{_sbindir}/alternatives --remove wine-d3d11 %{_libdir}/wine/wine-d3d11.%{winedll} + %{_sbindir}/alternatives --remove wine-dxgi%{?_isa} %{_libdir}/wine/wine-dxgi.dll.so + %{_sbindir}/alternatives --remove wine-d3d9%{?_isa} %{_libdir}/wine/wine-d3d9.%{winedll} + %{_sbindir}/alternatives --remove wine-d3d10%{?_isa} %{_libdir}/wine/wine-d3d10.%{winedll} + %{_sbindir}/alternatives --remove wine-d3d11%{?_isa} %{_libdir}/wine/wine-d3d11.%{winedll} fi %ldconfig_scriptlets ldap