From bf536083936a7f7d394aa6e6cd3e1353802e9965d324e524f52dd59ddcd0e8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 22 Aug 2019 08:24:32 +0000 Subject: [PATCH] Accepting request 725219 from home:namtrac:branches:multimedia:apps - Reintroduce _mpv_ver since subpackages have different versions and need to depend on _mpv_ver when appropriate. OBS-URL: https://build.opensuse.org/request/show/725219 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=154 --- mpv.changes | 6 ++++++ mpv.spec | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mpv.changes b/mpv.changes index 45f6781..dc74a17 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 22 06:58:51 UTC 2019 - Ismail Dönmez + +- Reintroduce _mpv_ver since subpackages have different versions + and need to depend on _mpv_ver when appropriate. + ------------------------------------------------------------------- Tue Aug 20 11:11:42 UTC 2019 - Ismail Dönmez diff --git a/mpv.spec b/mpv.spec index ae8943d..536e6a1 100644 --- a/mpv.spec +++ b/mpv.spec @@ -21,15 +21,16 @@ %define _waf_ver 2.0.9 %define _mbc_ver 3.3.17 +%define _mpv_ver 0.30.0+git.1566288741.80552ab28e %define lname libmpv1 Name: mpv -Version: 0.30.0+git.1566288741.80552ab28e +Version: %{_mpv_ver} Release: 0 Summary: Advanced general-purpose multimedia player License: GPL-2.0-or-later Group: Productivity/Multimedia/Video/Players Url: http://mpv.io/ -Source: %{name}-%{version}.tar.xz +Source: %{name}-%{_mpv_ver}.tar.xz Source1: https://waf.io/waf-%{_waf_ver} Source2: %{name}.changes # mpv-bash-completion is licensed with GPL-3.0+ @@ -141,7 +142,7 @@ Release: 0 Summary: Bash Completion for %{name} License: GPL-3.0-or-later Group: Productivity/Multimedia/Video/Players -Requires: %{name} = %{version} +Requires: %{name} = %{_mpv_ver} Requires: bash-completion Recommends: xrandr Supplements: packageand(mpv:bash) @@ -164,7 +165,7 @@ A Bash completion script for the mpv video player. It features Summary: ZSH Completion for %{name} License: GPL-2.0-or-later Group: Productivity/Multimedia/Video/Players -Requires: %{name} = %{version} +Requires: %{name} = %{_mpv_ver} Supplements: packageand(mpv:zsh) BuildArch: noarch @@ -175,7 +176,7 @@ ZSH command line completion support for %{name}. Summary: A library to link together with mpv player License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %{lname} = %{_mpv_ver} %description devel mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety @@ -206,7 +207,7 @@ chmod a+x waf # I hate UNKNOWN so lets put decent info there. MODIFIED="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE2}")" DATE="$(date -d "$MODIFIED" "+%%b %%e %%Y")" -sed -i "s|UNKNOWN|$DATE|g;s|VERSION|\"%{version}\"|g" common/version.c +sed -i "s|UNKNOWN|$DATE|g;s|VERSION|\"%{_mpv_ver}\"|g" common/version.c %build # SDL: disable as it is pointless to have on Linux, it is Windows/OS X fallback.