From 0a5238b4bd4df8e2d96a0b253ea913b191216f03 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Tue, 17 Jan 2023 16:29:57 -0600
Subject: [PATCH] Update to 8.0-rc4

---
 sources   |  6 +++---
 wine.spec | 26 ++++++++++++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/sources b/sources
index 583f020..c15af4b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (wine-7.22.tar.xz) = bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc
-SHA512 (wine-7.22.tar.xz.sign) = df8197045cd1a0b232f97dd5003b8dd141b81e8a535f4b25656c4570ce2a7cb87ab2a89ea476c48ba877a5dee5952b8d29f30118ef91dd17be9329455838b25d
-SHA512 (wine-staging-7.22.tar.gz) = 5fdac19ec290c67767fac71abe07d9350ec431919c67a0f2d2df18ced20f1d3dddb921b3d5586d03add187c6281e1a691cc220e8d2d5ad4eeb94015721479d65
+SHA512 (wine-8.0-rc4.tar.xz) = 9a88dd5a2759b9d778ae8a91a4d592c029578812dfa3535e5ffc56f44e804c74ea48e96b749643d82cebfedeab7ff33019cf9d981fd3b7256a92ecc41df8f757
+SHA512 (wine-8.0-rc4.tar.xz.sign) = b7a70126e4361cbfde752eeb99536b7fe789f216d276690f45f42514715899516eb2e11685bdfb3ee49c508f0d1b37b5a4fa7aefc5081045eccc3001984d0c13
+SHA512 (wine-staging-8.0-rc4.tar.gz) = b69f52580a86604b766306efc3d8941599da4c9dd7c5e4c4e9a6b870256e3889604c984fc91dac60286fc377c0ff292639945d4f13d7975dc54f5c786b55ab84
diff --git a/wine.spec b/wine.spec
index 409aec0..ec2d5ce 100644
--- a/wine.spec
+++ b/wine.spec
@@ -40,14 +40,14 @@
 %endif
 
 Name:           wine
-Version:        7.22
-Release:        2%{?dist}
+Version:        8.0
+Release:        0.rc4.1%{?dist}
 Summary:        A compatibility layer for windows applications
 
 License:        LGPLv2+
 URL:            https://www.winehq.org/
-Source0:        https://dl.winehq.org/wine/source/7.x/wine-%{version}.tar.xz
-Source10:       https://dl.winehq.org/wine/source/7.x/wine-%{version}.tar.xz.sign
+Source0:        https://dl.winehq.org/wine/source/8.0/wine-%{version}-rc4.tar.xz
+Source10:       https://dl.winehq.org/wine/source/8.0/wine-%{version}-rc4.tar.xz.sign
 
 Source1:        wine.init
 Source2:        wine.systemd
@@ -94,7 +94,7 @@ Patch511:       wine-cjk.patch
 %if 0%{?wine_staging}
 # wine-staging patches
 # pulseaudio-patch is covered by that patch-set, too.
-Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.gz
+Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}-rc4.tar.gz#/wine-staging-%{version}-rc4.tar.gz
 %endif
 
 %if !%{?no64bit}
@@ -698,7 +698,7 @@ This package adds the opencl driver for wine.
 %endif
 
 %prep
-%setup -qn wine-%{version}
+%setup -qn wine-%{version}-rc4
 %patch100 -p1 -b.autoconf
 %patch511 -p1 -b.cjk
 
@@ -723,6 +723,7 @@ patches/patchinstall.sh DESTDIR="`pwd`" --all
 # disable fortify as it breaks wine
 # http://bugs.winehq.org/show_bug.cgi?id=24606
 # http://bugs.winehq.org/show_bug.cgi?id=25073
+%undefine _fortify_level
 # Disable Red Hat specs for package notes (Fedora 38+) and annobin.
 # MinGW GCC does not support these options.
 %if 0%{?fedora_version} == 36
@@ -731,12 +732,15 @@ export LDFLAGS="$(echo "%{build_ldflags}" | sed -e 's/-Wl,-z,relro//' -e 's/-Wl,
 export LDFLAGS="$(echo "%{build_ldflags}" | sed -e 's/-Wl,-z,relro//' -e 's/-Wl,--build-id=sha1//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-package-notes//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
 %endif
 %ifarch x86_64
-export CFLAGS="$(echo "%{optflags}" | sed -e 's/-O2//' -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//') -O2"
+export CFLAGS="$(echo "%{optflags}" | sed -e 's/-O2//' -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//') -O2"
 %else
-export CFLAGS="$(echo "%{optflags}" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
+export CFLAGS="$(echo "%{optflags}" | sed -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
 %endif
 
 %ifarch  %{arm} aarch64
+# Wine enabled -Wl,-WX that turns linker warnings into errors
+# Fedora passes '--as-needed' for all binaries and this is a warning from the linker, now an error, so disable flag for now
+sed -i 's/-Wl,-WX//g' configure
 %if 0%{?fedora} >= 33
 %global toolchain clang
 %else
@@ -1435,6 +1439,7 @@ fi
 %endif
 %{_libdir}/wine/%{winepedir}/light.msstyles
 %{_libdir}/wine/%{winepedir}/loadperf.dll
+%{_libdir}/wine/%{winesodir}/localspl.so
 %{_libdir}/wine/%{winepedir}/localspl.dll
 %{_libdir}/wine/%{winepedir}/localui.dll
 %{_libdir}/wine/%{winepedir}/lodctr.exe
@@ -1770,6 +1775,7 @@ fi
 %{_libdir}/wine/%{winepedir}/wlanui.dll
 %{_libdir}/wine/%{winepedir}/wmphoto.dll
 %{_libdir}/wine/%{winepedir}/wnaspi32.dll
+%{_libdir}/wine/%{winepedir}/wofutil.dll
 %ifarch x86_64 aarch64
 %{_libdir}/wine/%{winepedir}/wow64.dll
 %{_libdir}/wine/%{winepedir}/wow64win.dll
@@ -2514,6 +2520,7 @@ fi
 %{_libdir}/wine/%{winesodir}/wlanui.dll.so
 %{_libdir}/wine/%{winesodir}/wmphoto.dll.so
 %{_libdir}/wine/%{winesodir}/wnaspi32.dll.so
+%{_libdir}/wine/%{winesodir}/wofutil.dll.so
 %{_libdir}/wine/%{winesodir}/wpc.dll.so
 %{_libdir}/wine/%{winesodir}/wpcap.dll.so
 %{_libdir}/wine/%{winesodir}/ws2_32.dll.so
@@ -2813,6 +2820,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan 16 2023 Michael Cronenworth <mike@cchtml.com> - 8.0-0.rc4.1
+- version update
+
 * Mon Nov 28 2022 Michael Cronenworth <mike@cchtml.com> - 7.22-2
 - fix typo in openal obsoletes