SHA256
1
0
forked from pool/wine

Accepting request 707176 from Emulators

- fix unexpanded %version macro in provides and obsoletes
- use %license macro

- build with gcc8 for now, gcc9 seems to break wine. (bsc#1137071)

OBS-URL: https://build.opensuse.org/request/show/707176
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=279
This commit is contained in:
Dominique Leuenberger 2019-06-03 16:58:07 +00:00 committed by Git OBS Bridge
commit f20461d127
2 changed files with 25 additions and 5 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Jun 3 10:44:25 UTC 2019 - Adrian Schröter <adrian@suse.de>
- fix unexpanded %version macro in provides and obsoletes
- use %license macro
-------------------------------------------------------------------
Mon Jun 3 05:25:36 UTC 2019 - Marcus Meissner <meissner@suse.com>
- build with gcc8 for now, gcc9 seems to break wine. (bsc#1137071)
-------------------------------------------------------------------
Sun May 26 08:30:03 UTC 2019 - Marcus Meissner <meissner@suse.com>

View File

@ -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
@ -57,6 +62,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
@ -78,6 +84,7 @@ Obsoletes: wine-mp3 < %version
Recommends: wine-mp3
%endif
BuildRequires: SDL2-devel
BuildRequires: gcc8
BuildRequires: ncurses-devel
BuildRequires: openal-soft-devel
BuildRequires: openldap2-devel
@ -108,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
@ -229,6 +233,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
@ -364,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