wine.sos.fix.diff

--- wine-orig.spec	2017-06-01 17:43:58.483796356 +0200
+++ wine.spec	2017-06-01 17:43:05.086559289 +0200
@@ -9,7 +9,7 @@
 # build with compholio-patches, see:  http://www.compholio.com/wine-compholio/
 # uncomment to enable; comment-out to disable.
 %if 0%{?fedora}
-%global compholio 1
+%global compholio 0
 %endif # 0%{?fedora}
 
 # binfmt macros for RHEL
@@ -71,10 +71,10 @@
 
 # wine compholio patches for wine-staging
 # pulseaudio-patch is covered by that patch-set, too.
-Source900: https://github.com/compholio/wine-compholio/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.gz
+#Source900: https://github.com/compholio/wine-compholio/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.gz
 
 %if !%{?no64bit}
-ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64
+ExclusiveArch:  %{ix86} x86_64 %{arm}
 %else
 ExclusiveArch:  %{ix86} %{arm}
 %endif
@@ -204,7 +204,7 @@
 %endif
 
 # ARM parts
-%ifarch %{arm} aarch64
+%ifarch %{arm}
 Requires:       wine-core = %{version}-%{release}
 Requires:       wine-capi = %{version}-%{release}
 Requires:       wine-cms = %{version}-%{release}
@@ -219,20 +219,6 @@
 Requires:       samba-winbind-clients
 %endif
 
-# aarch64 parts
-%ifarch aarch64
-Requires:       wine-core(aarch-64) = %{version}-%{release}
-Requires:       wine-capi(aarch-64) = %{version}-%{release}
-Requires:       wine-cms(aarch-64) = %{version}-%{release}
-Requires:       wine-ldap(aarch-64) = %{version}-%{release}
-Requires:       wine-twain(aarch-64) = %{version}-%{release}
-Requires:       wine-pulseaudio(aarch-64) = %{version}-%{release}
-Requires:       wine-openal(aarch-64) = %{version}-%{release}
-Requires:       wine-opencl(aarch-64) = %{version}-%{release}
-Requires:       mingw64-wine-gecko = %winegecko
-Requires:       mesa-dri-drivers(aarch-64)
-%endif
-
 %description
 Wine as a compatibility layer for UNIX to run Windows applications. This
 package includes a program loader, which allows unmodified Windows
@@ -298,7 +284,7 @@
 %endif
 %endif
 
-%ifarch %{arm} aarch64
+%ifarch %{arm}
 # CUPS support uses dlopen - rhbz#1367537
 Requires:       cups-libs
 Requires:       freetype
@@ -589,7 +575,7 @@
 %ifarch x86_64
 Requires: sane-backends-libs(x86-64)
 %endif
-%ifarch %{arm} aarch64
+%ifarch %{arm} 
 Requires: sane-backends-libs
 %endif
 
@@ -606,7 +592,7 @@
 %ifarch %{ix86}
 Requires:       isdn4k-utils(x86-32)
 %endif
-%ifarch %{arm} aarch64
+%ifarch %{arm}
 Requires:       isdn4k-utils
 %endif
 
@@ -663,9 +649,9 @@
 %setup -q -n wine-%{version}
 %patch511 -p1 -b.cjk
 
+%if 0%{?compholio}
 # setup and apply wine-staging patches
 gzip -dc %{SOURCE900} | tar -xf - --strip-components=1
-%if 0%{?compholio}
 
 make -C patches DESTDIR="`pwd`" install
 
@@ -696,7 +682,7 @@
  --x-includes=%{_includedir} --x-libraries=%{_libdir} \
  --without-hal --with-dbus \
  --with-x \
-%ifarch x86_64 aarch64
+%ifarch x86_64
  --enable-win64 \
 %endif
 %{?compholio: --with-xattr} \
@@ -714,14 +700,14 @@
         UPDATE_DESKTOP_DATABASE=/bin/true
 
 # setup for alternatives usage
-%ifarch x86_64 aarch64
+%ifarch x86_64
 mv %{buildroot}%{_bindir}/wineserver %{buildroot}%{_bindir}/wineserver64
 %endif
 %ifarch %{ix86} %{arm}
 mv %{buildroot}%{_bindir}/wine %{buildroot}%{_bindir}/wine32
 mv %{buildroot}%{_bindir}/wineserver %{buildroot}%{_bindir}/wineserver32
 %endif
-%ifnarch %{arm} aarch64 x86_64
+%ifnarch %{arm} x86_64
 mv %{buildroot}%{_bindir}/wine-preloader %{buildroot}%{_bindir}/wine32-preloader
 %endif
 touch %{buildroot}%{_bindir}/wine
@@ -733,7 +719,7 @@
 # remove rpath
 chrpath --delete %{buildroot}%{_bindir}/wmc
 chrpath --delete %{buildroot}%{_bindir}/wrc
-%ifarch x86_64 aarch64
+%ifarch x86_64
 chrpath --delete %{buildroot}%{_bindir}/wine64
 chrpath --delete %{buildroot}%{_bindir}/wineserver64
 %else
@@ -881,7 +867,7 @@
 install -p -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 %endif
 
-%ifarch x86_64 aarch64
+%ifarch x86_64
 install -p -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 %endif
 
@@ -977,7 +963,7 @@
 %post core -p /sbin/ldconfig
 
 %posttrans core
-%ifarch x86_64 aarch64
+%ifarch x86_64
 %{_sbindir}/alternatives --install %{_bindir}/wine \
   wine %{_bindir}/wine64 10 \
   --slave %{_bindir}/wine-preloader wine-preloader %{_bindir}/wine64-preloader
@@ -1001,7 +987,7 @@
 %postun core
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-%ifarch x86_64 aarch64 aarch64
+%ifarch x86_64
   %{_sbindir}/alternatives --remove wine %{_bindir}/wine64
   %{_sbindir}/alternatives --remove wineserver %{_bindir}/wineserver64
 %else
@@ -1076,7 +1062,7 @@
 %config %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 %endif
 
-%ifarch x86_64 aarch64
+%ifarch x86_64
 %{_bindir}/wine64
 %{_bindir}/wineserver64
 %config %{_sysconfdir}/ld.so.conf.d/wine-64.conf
@@ -1106,9 +1092,9 @@
 %{_libdir}/wine/expand.exe.so
 %{_libdir}/wine/extrac32.exe.so
 %{_libdir}/wine/findstr.exe.so
-%if 0%{?compholio}
+#%if 0%{?compholio}
 %{_libdir}/wine/fsutil.exe.so
-%endif
+#%endif
 %{_libdir}/wine/hostname.exe.so
 %{_libdir}/wine/ipconfig.exe.so
 %{_libdir}/wine/winhlp32.exe.so
@@ -1311,20 +1297,33 @@
 %{_libdir}/wine/api-ms-win-service-winsvc-l1-2-0.dll.so
 %{_libdir}/wine/api-ms-win-shell-shellcom-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-shell-shellfolders-l1-1-0.dll.so
-%if 0%{?compholio}
+
 %{_libdir}/wine/api-ms-win-appmodel-runtime-l1-1-1.dll.so
 %{_libdir}/wine/api-ms-win-core-apiquery-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-core-com-l1-1-1.dll.so
 %{_libdir}/wine/api-ms-win-core-delayload-l1-1-1.dll.so
-%{_libdir}/wine/api-ms-win-core-heap-l2-1-0.dll.so
 %{_libdir}/wine/api-ms-win-core-kernel32-legacy-l1-1-1.dll.so
 %{_libdir}/wine/api-ms-win-core-libraryloader-l1-2-0.dll.so
-%{_libdir}/wine/api-ms-win-core-quirks-l1-1-0.dll.so
-%{_libdir}/wine/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll.so
 %{_libdir}/wine/api-ms-win-core-threadpool-l1-2-0.dll.so
 %{_libdir}/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-core-wow64-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-eventing-classicprovider-l1-1-0.dll.so
+
+
+%if 0%{?compholio}
+#%{_libdir}/wine/api-ms-win-appmodel-runtime-l1-1-1.dll.so
+#%{_libdir}/wine/api-ms-win-core-apiquery-l1-1-0.dll.so
+#%{_libdir}/wine/api-ms-win-core-com-l1-1-1.dll.so
+#%{_libdir}/wine/api-ms-win-core-delayload-l1-1-1.dll.so
+%{_libdir}/wine/api-ms-win-core-heap-l2-1-0.dll.so
+#%{_libdir}/wine/api-ms-win-core-kernel32-legacy-l1-1-1.dll.so
+#%{_libdir}/wine/api-ms-win-core-libraryloader-l1-2-0.dll.so
+%{_libdir}/wine/api-ms-win-core-quirks-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll.so
+#%{_libdir}/wine/api-ms-win-core-threadpool-l1-2-0.dll.so
+#%{_libdir}/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so
+#%{_libdir}/wine/api-ms-win-core-wow64-l1-1-0.dll.so
+#%{_libdir}/wine/api-ms-win-eventing-classicprovider-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-rtcore-ntuser-draw-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-rtcore-ntuser-window-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-shcore-obsolete-l1-1-0.dll.so
@@ -1438,12 +1437,17 @@
 %{_libdir}/wine/ext-ms-win-rtcore-gdi-rgn-l1-1-0.dll.so
 %{_libdir}/wine/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.dll.so
 %{_libdir}/wine/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.dll.so
+
+%{_libdir}/wine/ext-ms-win-kernel32-package-current-l1-1-0.dll.so
+%{_libdir}/wine/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll.so
+
+
 %if 0%{?compholio}
 %{_libdir}/wine/ext-ms-win-appmodel-usercontext-l1-1-0.dll.so
-%{_libdir}/wine/ext-ms-win-kernel32-package-current-l1-1-0.dll.so
+#%{_libdir}/wine/ext-ms-win-kernel32-package-current-l1-1-0.dll.so
 %{_libdir}/wine/ext-ms-win-ntuser-mouse-l1-1-0.dll.so
 %{_libdir}/wine/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll.so
-%{_libdir}/wine/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll.so
+#%{_libdir}/wine/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll.so
 %{_libdir}/wine/ext-ms-win-uxtheme-themes-l1-1-0.dll.so
 %{_libdir}/wine/ext-ms-win-xaml-pal-l1-1-0.dll.so
 %endif
@@ -1498,9 +1502,9 @@
 %{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/jsproxy.dll.so
 %{_libdir}/wine/kernel32.dll.so
-%if 0%{?compholio}
+#%if 0%{?compholio}
 %{_libdir}/wine/kernelbase.dll.so
-%endif
+#%endif
 %{_libdir}/wine/ksuser.dll.so
 %{_libdir}/wine/ktmw32.dll.so
 %{_libdir}/wine/loadperf.dll.so
@@ -1674,9 +1678,9 @@
 %{_libdir}/wine/shell32.dll.so
 %{_libdir}/wine/shfolder.dll.so
 %{_libdir}/wine/shlwapi.dll.so
-%if 0%{?compholio}
+#%if 0%{?compholio}
 %{_libdir}/wine/shutdown.exe.so
-%endif
+#%endif
 %{_libdir}/wine/slbcsp.dll.so
 %{_libdir}/wine/slc.dll.so
 %{_libdir}/wine/snmpapi.dll.so
@@ -1695,9 +1699,9 @@
 %{_libdir}/wine/tapi32.dll.so
 %{_libdir}/wine/taskkill.exe.so
 %{_libdir}/wine/taskschd.dll.so
-%if 0%{?compholio}
+#%if 0%{?compholio}
 %{_libdir}/wine/tdi.sys.so
-%endif
+#%endif
 %{_libdir}/wine/traffic.dll.so
 %{_libdir}/wine/ucrtbase.dll.so
 %if 0%{?compholio}
@@ -1827,7 +1831,7 @@
 %{_libdir}/wine/xpssvcs.dll.so
 
 %if 0%{?compholio}
-%ifarch x86_64 aarch64
+%ifarch x86_64
 %{_libdir}/wine/nvapi64.dll.so
 %{_libdir}/wine/nvencodeapi64.dll.so
 %else
@@ -1837,7 +1841,7 @@
 %endif
 
 # 16 bit and other non 64bit stuff
-%ifnarch x86_64 %{arm} aarch64
+%ifnarch x86_64 %{arm}
 %{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/mmdevldr.vxd.so