From a3034dde31a89892400b1d896cf8249937fe67828d661d1bb4176392120f1b0e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 1 Jun 2019 07:02:19 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=624 --- wine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wine.spec b/wine.spec index d470d7e..13c4f06 100644 --- a/wine.spec +++ b/wine.spec @@ -57,6 +57,7 @@ BuildRequires: freetype2-devel BuildRequires: giflib-devel BuildRequires: glib2-devel BuildRequires: gstreamer-plugins-base-devel +BuildRequires: krb5-devel BuildRequires: libgnutls-devel BuildRequires: libgphoto2-devel BuildRequires: libgsm-devel From 089e2aa1d98160965c0c2962475208c0fec962eae35b329603900209bca0944e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 3 Jun 2019 05:25:59 +0000 Subject: [PATCH 2/4] - build with gcc8 for now, gcc9 seems to break wine. OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=625 --- wine.changes | 5 +++++ wine.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/wine.changes b/wine.changes index ebc2118..dc4df23 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 3 05:25:36 UTC 2019 - Marcus Meissner + +- build with gcc8 for now, gcc9 seems to break wine. + ------------------------------------------------------------------- Sun May 26 08:30:03 UTC 2019 - Marcus Meissner diff --git a/wine.spec b/wine.spec index 13c4f06..69ffca5 100644 --- a/wine.spec +++ b/wine.spec @@ -79,6 +79,7 @@ Obsoletes: wine-mp3 < %version Recommends: wine-mp3 %endif BuildRequires: SDL2-devel +BuildRequires: gcc8 BuildRequires: ncurses-devel BuildRequires: openal-soft-devel BuildRequires: openldap2-devel @@ -230,6 +231,9 @@ export WIDL_TIME_OVERRIDE="0" # for reproducible builds. export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'` %endif +if rpm -q gcc|grep gcc-9 ; then + export CC=gcc-8 +fi %ifarch aarch64 # ARM64 now requires clang # https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95 From 4bf7743d20eb0718fda8395a7ec670a278b9a134aaa1487338f981c7497849a9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 3 Jun 2019 11:18:25 +0000 Subject: [PATCH 3/4] Accepting request 707132 from home:adrianSuSE:branches:Emulators - fix unexpanded %version macro in provides and obsoletes - use %license macro OBS-URL: https://build.opensuse.org/request/show/707132 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=626 --- wine.changes | 6 ++++++ wine.spec | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/wine.changes b/wine.changes index dc4df23..f9eb9ab 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 3 10:44:25 UTC 2019 - Adrian Schröter + +- fix unexpanded %version macro in provides and obsoletes +- use %license macro + ------------------------------------------------------------------- Mon Jun 3 05:25:36 UTC 2019 - Marcus Meissner diff --git a/wine.spec b/wine.spec index 69ffca5..f62147c 100644 --- a/wine.spec +++ b/wine.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -28,9 +28,14 @@ %define nine 1 %endif +# needs to be on top due to usage of %version macro below +%define realver 4.9 +Version: 4.9 +Release: 0 + %if "%{flavor}" != "" Name: wine%{?flavor:-}%{?flavor} -Provides: wine = %{version} +Provides: wine = %{version}-%{release} %else Name: wine %endif @@ -110,9 +115,6 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 4.9 -Version: 4.9 -Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later Group: System/Emulators/PC @@ -369,7 +371,8 @@ chmod 755 %winedir/my-find-requires.sh %files %defattr(-,root,root) -%doc ANNOUNCE AUTHORS LICENSE LICENSE.OLD README* +%license LICENSE LICENSE.OLD +%doc ANNOUNCE AUTHORS README* %{_bindir}/function_grep.pl %{_bindir}/msidb %{_bindir}/msiexec From 43dfb2a9c550c09c53f8c620c6ead4b0a8518eb0d546a5165f0aa8d633970149 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 3 Jun 2019 11:20:30 +0000 Subject: [PATCH 4/4] - build with gcc8 for now, gcc9 seems to break wine. (bsc#1137071) OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=627 --- wine.changes | 3 ++- wine.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wine.changes b/wine.changes index f9eb9ab..dac7b44 100644 --- a/wine.changes +++ b/wine.changes @@ -7,7 +7,8 @@ Mon Jun 3 10:44:25 UTC 2019 - Adrian Schröter ------------------------------------------------------------------- Mon Jun 3 05:25:36 UTC 2019 - Marcus Meissner -- build with gcc8 for now, gcc9 seems to break wine. +- build with gcc8 for now, gcc9 seems to break wine. (bsc#1137071) + ------------------------------------------------------------------- Sun May 26 08:30:03 UTC 2019 - Marcus Meissner diff --git a/wine.spec b/wine.spec index f62147c..13330c4 100644 --- a/wine.spec +++ b/wine.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ #