From 4bf7743d20eb0718fda8395a7ec670a278b9a134aaa1487338f981c7497849a9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 3 Jun 2019 11:18:25 +0000 Subject: [PATCH] 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