From 1e6b5198161be8cf047fb7187ab9b64dd2e160f4 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Wed, 21 Dec 2016 12:54:35 -0600 Subject: [PATCH] Update to 2.0-rc2 --- .gitignore | 6 +++--- sources | 6 +++--- wine.spec | 19 ++++++++++++++----- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ebfff69..970c386 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/wine-2.0-rc1.tar.bz2 -/wine-2.0-rc1.tar.bz2.sign -/wine-staging-2.0-rc1.tar.gz +/wine-2.0-rc2.tar.bz2 +/wine-2.0-rc2.tar.bz2.sign +/wine-staging-2.0-rc2.tar.gz diff --git a/sources b/sources index 479af92..245b41c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wine-2.0-rc1.tar.bz2) = 052ec3cbdbf0b201d5afdd66c244fa834498396a444d657e357c9427b2a19171f77998586816a41b4471d080e81198b7df2d77b92095783bca37c70507b2e475 -SHA512 (wine-2.0-rc1.tar.bz2.sign) = f156c07c0cb94f8fd56185115c2c02d9d4a721031707d07862651c2dc8a67b1ff480048b6e4d3c535ef9487fefb1736ac754aaebadfc4a7b0f8041f24ba976fa -SHA512 (wine-staging-2.0-rc1.tar.gz) = 75e25930314ec8cc476cef675b72c34f2e210ef7fd585b44d06f2e88875dbe863abb7d6b29742f6cc413758f72dda7cc45c227a2e467b5cfff71150201ef5773 +SHA512 (wine-2.0-rc2.tar.bz2) = 89efaea78f5591089c922b22eec5426e8421e51edd55997a1e3ceee4bb32757c457856d7659b2829337bb9db4eea68cf2e1a06eff6b8b13c7c147472d13c1983 +SHA512 (wine-2.0-rc2.tar.bz2.sign) = 0bf7a90e67c2477045bbc144508b92655bc0bbe54bc914c56650b84f2e0babd3c788f60fde668fcbf1d1a52d9a3ac4306b5ad8cf261d5ae41eb8277babcd7a95 +SHA512 (wine-staging-2.0-rc2.tar.gz) = 791bea1f3b9a3843c3c8aad536ca6146e896cf77234d2a79dc408a6dd53c781f80d07f1a6cd869c836bfc1308daca916dc73f12b87de6df35d34006136133554 diff --git a/wine.spec b/wine.spec index eae91a8..9c587d1 100644 --- a/wine.spec +++ b/wine.spec @@ -22,14 +22,14 @@ Name: wine Version: 2.0 -Release: 0.1.rc1%{?dist} +Release: 0.1.rc2%{?dist} Summary: A compatibility layer for windows applications Group: Applications/Emulators License: LGPLv2+ URL: http://www.winehq.org/ -Source0: http://downloads.sourceforge.net/wine/wine-%{version}-rc1.tar.bz2 -Source10: http://downloads.sourceforge.net/wine/wine-%{version}-rc1.tar.bz2.sign +Source0: http://downloads.sourceforge.net/wine/wine-%{version}-rc2.tar.bz2 +Source10: http://downloads.sourceforge.net/wine/wine-%{version}-rc2.tar.bz2.sign Source1: wine.init Source2: wine.systemd @@ -71,7 +71,7 @@ Patch511: wine-cjk.patch # 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}-rc1.tar.gz +Source900: https://github.com/compholio/wine-compholio/archive/v%{version}.tar.gz#/wine-staging-%{version}-rc2.tar.gz %if !%{?no64bit} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 @@ -660,7 +660,7 @@ This package adds the opencl driver for wine. %endif %prep -%setup -q -n wine-%{version}-rc1 +%setup -q -n wine-%{version}-rc2 %patch511 -p1 -b.cjk # setup and apply wine-staging patches @@ -683,7 +683,13 @@ rm -rf patches/ # disable fortify as it breaks wine # http://bugs.winehq.org/show_bug.cgi?id=24606 # http://bugs.winehq.org/show_bug.cgi?id=25073 +%if 0%{?fedora} < 26 export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno-error" +%else +# https://bugzilla.redhat.com/show_bug.cgi?id=1406093 +export TEMP_CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-O2/-O1/'`" +export CFLAGS="`echo $TEMP_CFLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno-error" +%endif %configure \ --sysconfdir=%{_sysconfdir}/wine \ @@ -2108,6 +2114,9 @@ fi %endif %changelog +* Wed Dec 21 2016 Michael Cronenworth 2.0-0.1.rc2 +- version update + * Thu Dec 15 2016 Michael Cronenworth 2.0-0.1.rc1 - version update