SHA256
1
0
forked from pool/wine

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
This commit is contained in:
Marcus Meissner 2019-06-03 11:18:25 +00:00 committed by Git OBS Bridge
parent 089e2aa1d9
commit 4bf7743d20
2 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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> Mon Jun 3 05:25:36 UTC 2019 - Marcus Meissner <meissner@suse.com>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 %define nine 1
%endif %endif
# needs to be on top due to usage of %version macro below
%define realver 4.9
Version: 4.9
Release: 0
%if "%{flavor}" != "" %if "%{flavor}" != ""
Name: wine%{?flavor:-}%{?flavor} Name: wine%{?flavor:-}%{?flavor}
Provides: wine = %{version} Provides: wine = %{version}-%{release}
%else %else
Name: wine Name: wine
%endif %endif
@ -110,9 +115,6 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%define realver 4.9
Version: 4.9
Release: 0
Summary: An MS Windows Emulator Summary: An MS Windows Emulator
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/Emulators/PC Group: System/Emulators/PC
@ -369,7 +371,8 @@ chmod 755 %winedir/my-find-requires.sh
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc ANNOUNCE AUTHORS LICENSE LICENSE.OLD README* %license LICENSE LICENSE.OLD
%doc ANNOUNCE AUTHORS README*
%{_bindir}/function_grep.pl %{_bindir}/function_grep.pl
%{_bindir}/msidb %{_bindir}/msidb
%{_bindir}/msiexec %{_bindir}/msiexec