From 7ea605fb662f342e6b233f1798cf6d925b494af5ef9985fd0af9e7218a137f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 2 Jan 2017 23:26:36 +0000 Subject: [PATCH 1/9] Accepting request 448553 from home:alois:branches:multimedia:apps Embedded mpv-bash-completion to avoid headaches. OBS-URL: https://build.opensuse.org/request/show/448553 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=72 --- mpv-bash-completion-3.3.7.tar.gz | 3 +++ mpv.changes | 6 ++++++ mpv.spec | 20 +++++++++++++++----- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 mpv-bash-completion-3.3.7.tar.gz diff --git a/mpv-bash-completion-3.3.7.tar.gz b/mpv-bash-completion-3.3.7.tar.gz new file mode 100644 index 0000000..d90c721 --- /dev/null +++ b/mpv-bash-completion-3.3.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eb7f516539b0a1b9221088ba0e6676bda63746432ce1c7ec7a2dd91c3dff766 +size 18986 diff --git a/mpv.changes b/mpv.changes index 839943b..e4fd958 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 2 21:19:27 UTC 2017 - aloisio@gmx.com + +- Added mpv-bash-completion-3.3.7.tar.gz to generate + a bash-completion script + ------------------------------------------------------------------- Sun Dec 25 16:33:11 UTC 2016 - aloisio@gmx.com diff --git a/mpv.spec b/mpv.spec index 2064b8e..1acad82 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,7 +1,7 @@ # # spec file for package mpv # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 Packman Team # Copyright (c) 2012 Jiri Slaby # Copyright (c) 2011-2012 Pascal Bleser @@ -20,19 +20,22 @@ %define _waf_ver 1.9.5 +%define _mbc_ver 3.3.7 %define lname libmpv1 Name: mpv Version: 0.23.0 Release: 0 Summary: Advanced general-purpose multimedia player -# waf is licensed with BSD-3-Clause -License: GPL-2.0+ and BSD-3-Clause +License: GPL-2.0+ and BSD-3-Clause and GPL-3.0+ Group: Productivity/Multimedia/Video/Players +# waf is licensed with BSD-3-Clause Url: http://mpv.io/ Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Can't use system one as it breaks quite often with updates Source1: http://waf.io/waf-%{_waf_ver} Source2: %{name}.changes +# mpv-bash-completion is licensed with GPL-3.0+ +Source3: https://github.com/2ion/mpv-bash-completion/archive/%{_mbc_ver}.tar.gz#/mpv-bash-completion-%{_mbc_ver}.tar.gz # PATCH-FIX-OPENSUSE do not require equal libav versions, obs rebuilds as needed Patch0: mpv-make-ffmpeg-version-check-non-fatal.patch BuildRequires: hicolor-icon-theme @@ -94,7 +97,10 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -Recommends: mpv-bash-completion +Requires: bash >= 4.0 +Requires: bash-completion +Requires: lua +Recommends: xrandr # Used via LUA scripts Recommends: youtube-dl # Obsoletion of mplayer2 that is dead for 2 years now @@ -152,7 +158,7 @@ This package contains a library that can other apps use to utilize the mpv features. %prep -%setup -q +%setup -q -a 3 %patch0 -p1 # As we downloaded specific waf version we need to put and prepare it in place. @@ -197,10 +203,12 @@ export CCFLAGS="%{optflags}" install -D -m 0644 etc/input.conf %{buildroot}%{_sysconfdir}/%{name}/input.conf install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf +install -D -m755 mpv-bash-completion-%{_mbc_ver}/gen.lua %{buildroot}%{_libexecdir}/mpv-bash-completion/gen.lua %post %desktop_database_post %icon_theme_cache_post +/bin/bash -c '%{_libexecdir}/mpv-bash-completion/gen.lua >%{_sysconfdir}/bash_completion.d/mpv' %postun %desktop_database_postun @@ -226,6 +234,8 @@ install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf #zsh completion %{_datadir}/zsh/site-functions/_mpv %{_mandir}/man?/%{name}.?%{?ext_man} +%{_libexecdir}/mpv-bash-completion +%ghost %{_sysconfdir}/bash_completion.d/mpv %files -n %{lname} %defattr(-,root,root) From cf6e7a099680dd76bd87421fbf8b4b8cbf32bc58b373edb750b0775a6cb08c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 3 Jan 2017 00:00:33 +0000 Subject: [PATCH 2/9] - Split the completion to separate subpackage and build it in obs not during post OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=73 --- mpv.changes | 6 +++++ mpv.spec | 66 ++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/mpv.changes b/mpv.changes index e4fd958..1098b63 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 2 23:59:18 UTC 2017 - tchvatal@suse.com + +- Split the completion to separate subpackage and build it in obs not + during post + ------------------------------------------------------------------- Mon Jan 2 21:19:27 UTC 2017 - aloisio@gmx.com diff --git a/mpv.spec b/mpv.spec index 1acad82..ede73d8 100644 --- a/mpv.spec +++ b/mpv.spec @@ -26,9 +26,9 @@ Name: mpv Version: 0.23.0 Release: 0 Summary: Advanced general-purpose multimedia player +# waf is licensed with BSD-3-Clause License: GPL-2.0+ and BSD-3-Clause and GPL-3.0+ Group: Productivity/Multimedia/Video/Players -# waf is licensed with BSD-3-Clause Url: http://mpv.io/ Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Can't use system one as it breaks quite often with updates @@ -38,20 +38,17 @@ Source2: %{name}.changes Source3: https://github.com/2ion/mpv-bash-completion/archive/%{_mbc_ver}.tar.gz#/mpv-bash-completion-%{_mbc_ver}.tar.gz # PATCH-FIX-OPENSUSE do not require equal libav versions, obs rebuilds as needed Patch0: mpv-make-ffmpeg-version-check-non-fatal.patch +BuildRequires: bash BuildRequires: hicolor-icon-theme -Requires: hicolor-icon-theme -Requires(post): hicolor-icon-theme -Requires(post): update-desktop-files -Requires(postun): hicolor-icon-theme -Requires(postun): update-desktop-files BuildRequires: ladspa-devel BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: linux-kernel-headers BuildRequires: lirc-devel +BuildRequires: lua BuildRequires: ncurses-devel BuildRequires: perl -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python-docutils BuildRequires: update-desktop-files BuildRequires: yasm @@ -97,9 +94,11 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -Requires: bash >= 4.0 -Requires: bash-completion -Requires: lua +Requires: hicolor-icon-theme +Requires(post): hicolor-icon-theme +Requires(post): update-desktop-files +Requires(postun): hicolor-icon-theme +Requires(postun): update-desktop-files Recommends: xrandr # Used via LUA scripts Recommends: youtube-dl @@ -111,7 +110,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # JIT for lua. %if 0%{?suse_version} > 1320 BuildRequires: python-rst2pdf -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 BuildRequires: pkgconfig(luajit) %endif %endif @@ -135,6 +134,27 @@ BuildRequires: pkgconfig(xkbcommon) >= 0.3.0 mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types. +%package bash-completion +Summary: Bash Completion for %{name} +Group: Productivity/Multimedia/Video/Players +Requires: %{name} = %{version} +Requires: bash-completion +Supplements: packageand(mpv:bash) +BuildArch: noarch + +%description bash-completion +Bash command line completion support for %{name}. + +%package zsh-completion +Summary: ZSH Completion for %{name} +Group: Productivity/Multimedia/Video/Players +Requires: %{name} = %{version} +Supplements: packageand(mpv:zsh) +BuildArch: noarch + +%description zsh-completion +ZSH command line completion support for %{name}. + %package devel Summary: A library to link together with mpv player Group: Development/Libraries/C and C++ @@ -198,24 +218,30 @@ export CCFLAGS="%{optflags}" ./waf build --verbose %{?_smp_mflags} +pushd mpv-bash-completion-%{_mbc_ver} +export MPV_BASHCOMPGEN_MPV_CMD=../build/mpv +make %{?_smp_mflags} +popd + %install ./waf --destdir=%{buildroot} install +pushd mpv-bash-completion-%{_mbc_ver} +%make_install +popd + install -D -m 0644 etc/input.conf %{buildroot}%{_sysconfdir}/%{name}/input.conf install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf -install -D -m755 mpv-bash-completion-%{_mbc_ver}/gen.lua %{buildroot}%{_libexecdir}/mpv-bash-completion/gen.lua %post %desktop_database_post %icon_theme_cache_post -/bin/bash -c '%{_libexecdir}/mpv-bash-completion/gen.lua >%{_sysconfdir}/bash_completion.d/mpv' %postun %desktop_database_postun %icon_theme_cache_postun %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files @@ -231,11 +257,15 @@ install -D -m755 mpv-bash-completion-%{_mbc_ver}/gen.lua %{buildroot}%{_libexecd %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor -#zsh completion -%{_datadir}/zsh/site-functions/_mpv %{_mandir}/man?/%{name}.?%{?ext_man} -%{_libexecdir}/mpv-bash-completion -%ghost %{_sysconfdir}/bash_completion.d/mpv + +%files zsh-completion +%defattr(-,root,root) +%{_datadir}/zsh/site-functions/_mpv + +%files bash-completion +%defattr(-,root,root) +%{_datadir}/bash-completion/completions/mpv %files -n %{lname} %defattr(-,root,root) From 6090e2df94e17f54f220eb59125ff2c0a7c73c36978d77443660a7eca9b2d0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 3 Jan 2017 09:56:14 +0000 Subject: [PATCH 3/9] Accepting request 448591 from home:alois:branches:multimedia:apps Minor nitpicking. OBS-URL: https://build.opensuse.org/request/show/448591 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=74 --- mpv.changes | 5 +++++ mpv.spec | 21 ++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/mpv.changes b/mpv.changes index 1098b63..1869485 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 3 08:38:56 UTC 2017 - aloisio@gmx.com + +- Fixed minor details for the mpv-bash-completion subpackage + ------------------------------------------------------------------- Mon Jan 2 23:59:18 UTC 2017 - tchvatal@suse.com diff --git a/mpv.spec b/mpv.spec index ede73d8..0547d09 100644 --- a/mpv.spec +++ b/mpv.spec @@ -26,9 +26,9 @@ Name: mpv Version: 0.23.0 Release: 0 Summary: Advanced general-purpose multimedia player -# waf is licensed with BSD-3-Clause License: GPL-2.0+ and BSD-3-Clause and GPL-3.0+ Group: Productivity/Multimedia/Video/Players +# waf is licensed with BSD-3-Clause Url: http://mpv.io/ Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Can't use system one as it breaks quite often with updates @@ -99,7 +99,6 @@ Requires(post): hicolor-icon-theme Requires(post): update-desktop-files Requires(postun): hicolor-icon-theme Requires(postun): update-desktop-files -Recommends: xrandr # Used via LUA scripts Recommends: youtube-dl # Obsoletion of mplayer2 that is dead for 2 years now @@ -135,15 +134,30 @@ mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types. %package bash-completion +Version: %{_mbc_ver} +Release: 0 Summary: Bash Completion for %{name} Group: Productivity/Multimedia/Video/Players Requires: %{name} = %{version} Requires: bash-completion +Recommends: xrandr Supplements: packageand(mpv:bash) BuildArch: noarch %description bash-completion -Bash command line completion support for %{name}. +A script for generating a Bash completion script for the popular mpv +video player. It features... + + * Completion for all --options, + * Type-based completion for --option arguments for choices, flags, + integers and floats, + * Completion for upper/lower bounds for integer- and float-type + argument ranges where applicable, + * Completion of filter lists as arguments to --vf and --af style + options as well as completion of filter parameters while composing + filter lists, + * Similarly, parameter completion for video and audio outputs (--vo, --ao), + * Regular file name completion. %package zsh-completion Summary: ZSH Completion for %{name} @@ -265,6 +279,7 @@ install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf %files bash-completion %defattr(-,root,root) +%doc mpv-bash-completion-%{_mbc_ver}/LICENSE mpv-bash-completion-%{_mbc_ver}/README.mkd %{_datadir}/bash-completion/completions/mpv %files -n %{lname} From 3c263f9b4551c75e96ae2219c8c3e8b80a6947d576930befc964859c265ad3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 3 Jan 2017 11:31:22 +0000 Subject: [PATCH 4/9] - Use system waf, seems not to break for now anymore - Use correct licenses in all subpkgs OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=75 --- mpv.changes | 6 ++++++ mpv.spec | 24 +++++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mpv.changes b/mpv.changes index 1869485..5753a73 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 3 11:30:54 UTC 2017 - tchvatal@suse.com + +- Use system waf, seems not to break for now anymore +- Use correct licenses in all subpkgs + ------------------------------------------------------------------- Tue Jan 3 08:38:56 UTC 2017 - aloisio@gmx.com diff --git a/mpv.spec b/mpv.spec index 0547d09..c2675b2 100644 --- a/mpv.spec +++ b/mpv.spec @@ -19,20 +19,16 @@ # -%define _waf_ver 1.9.5 %define _mbc_ver 3.3.7 %define lname libmpv1 Name: mpv Version: 0.23.0 Release: 0 Summary: Advanced general-purpose multimedia player -License: GPL-2.0+ and BSD-3-Clause and GPL-3.0+ +License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players -# waf is licensed with BSD-3-Clause Url: http://mpv.io/ Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# Can't use system one as it breaks quite often with updates -Source1: http://waf.io/waf-%{_waf_ver} Source2: %{name}.changes # mpv-bash-completion is licensed with GPL-3.0+ Source3: https://github.com/2ion/mpv-bash-completion/archive/%{_mbc_ver}.tar.gz#/mpv-bash-completion-%{_mbc_ver}.tar.gz @@ -51,6 +47,7 @@ BuildRequires: perl BuildRequires: pkgconfig BuildRequires: python-docutils BuildRequires: update-desktop-files +BuildRequires: waf BuildRequires: yasm BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(caca) @@ -119,7 +116,6 @@ BuildRequires: pkgconfig(luajit) # Wayland and libguess. BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(libguess) -%if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(wayland-client) >= 1.6.0 BuildRequires: pkgconfig(wayland-cursor) >= 1.6.0 BuildRequires: pkgconfig(wayland-egl) @@ -127,7 +123,6 @@ BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xkbcommon) >= 0.3.0 %endif -%endif %description mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety @@ -137,6 +132,7 @@ of video file formats, audio and video codecs, and subtitle types. Version: %{_mbc_ver} Release: 0 Summary: Bash Completion for %{name} +License: GPL-3.0+ Group: Productivity/Multimedia/Video/Players Requires: %{name} = %{version} Requires: bash-completion @@ -147,7 +143,6 @@ BuildArch: noarch %description bash-completion A script for generating a Bash completion script for the popular mpv video player. It features... - * Completion for all --options, * Type-based completion for --option arguments for choices, flags, integers and floats, @@ -161,6 +156,7 @@ video player. It features... %package zsh-completion Summary: ZSH Completion for %{name} +License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players Requires: %{name} = %{version} Supplements: packageand(mpv:zsh) @@ -171,6 +167,7 @@ ZSH command line completion support for %{name}. %package devel Summary: A library to link together with mpv player +License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} @@ -182,6 +179,7 @@ This package contains all the development files. %package -n %{lname} Summary: A library to link together with mpv player +License: GPL-2.0+ Group: System/Libraries %description -n %{lname} @@ -195,10 +193,6 @@ features. %setup -q -a 3 %patch0 -p1 -# As we downloaded specific waf version we need to put and prepare it in place. -cp -f %{SOURCE1} waf -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")" @@ -212,7 +206,7 @@ myopts+=" --disable-build-date" # Debug just adds -g and we do that over optflags anyway. myopts+=" --disable-debug" export CCFLAGS="%{optflags}" -./waf configure \ +waf configure \ --prefix="%{_prefix}" \ --bindir="%{_bindir}" \ --mandir="%{_mandir}" \ @@ -230,7 +224,7 @@ export CCFLAGS="%{optflags}" %endif ${myopts} -./waf build --verbose %{?_smp_mflags} +waf build --verbose %{?_smp_mflags} pushd mpv-bash-completion-%{_mbc_ver} export MPV_BASHCOMPGEN_MPV_CMD=../build/mpv @@ -238,7 +232,7 @@ make %{?_smp_mflags} popd %install -./waf --destdir=%{buildroot} install +waf --destdir=%{buildroot} install pushd mpv-bash-completion-%{_mbc_ver} %make_install From 09d49f1bff23a4e3613cb3a173c2452635c4a0bdb071b77721f3fae1faee4cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 3 Jan 2017 11:31:44 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=76 --- .gitattributes | 2 -- waf-1.9.5 | 3 --- 2 files changed, 5 deletions(-) delete mode 100644 waf-1.9.5 diff --git a/.gitattributes b/.gitattributes index c5cacf3..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -waf-1.9.5 filter=lfs diff=lfs merge=lfs -text diff --git a/waf-1.9.5 b/waf-1.9.5 deleted file mode 100644 index 5723a1e..0000000 --- a/waf-1.9.5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:101f14e0f47a6410c00b8feda094948516cd3989491c56eb8268907fcd164909 -size 100139 From 2b25d2c90a68ee1e43dce88285eb3ba94359a3c6ec028ef39d5d0e7742fdbcf1 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 3 Jan 2017 17:59:58 +0000 Subject: [PATCH 6/9] Accepting request 448658 from home:alois:branches:multimedia:apps sr#448610 fails autochecks:/ OBS-URL: https://build.opensuse.org/request/show/448658 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=77 --- mpv.changes | 6 ++++++ mpv.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mpv.changes b/mpv.changes index 5753a73..b9d3dfb 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 3 17:33:17 UTC 2017 - aloisio@gmx.com + +- Fixed version requirement in the bash-completion + subpackage + ------------------------------------------------------------------- Tue Jan 3 11:30:54 UTC 2017 - tchvatal@suse.com diff --git a/mpv.spec b/mpv.spec index c2675b2..bcaac19 100644 --- a/mpv.spec +++ b/mpv.spec @@ -20,9 +20,10 @@ %define _mbc_ver 3.3.7 +%define _mpv_ver 0.23.0 %define lname libmpv1 Name: mpv -Version: 0.23.0 +Version: %{_mpv_ver} Release: 0 Summary: Advanced general-purpose multimedia player License: GPL-2.0+ @@ -134,7 +135,7 @@ Release: 0 Summary: Bash Completion for %{name} License: GPL-3.0+ Group: Productivity/Multimedia/Video/Players -Requires: %{name} = %{version} +Requires: %{name} = %{_mpv_ver} Requires: bash-completion Recommends: xrandr Supplements: packageand(mpv:bash) From 2feeffac9dab0d501e91ba1052fe56149f8df95c6df02bae025e0ba2f92a0680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 3 Jan 2017 20:06:13 +0000 Subject: [PATCH 7/9] Accepting request 448669 from home:alois:branches:multimedia:apps I tested it this time! OBS-URL: https://build.opensuse.org/request/show/448669 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=78 --- mpv.changes | 5 +++++ mpv.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mpv.changes b/mpv.changes index b9d3dfb..ef5d9a8 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 3 19:49:41 UTC 2017 - aloisio@gmx.com + +- Further version requirement fixes + ------------------------------------------------------------------- Tue Jan 3 17:33:17 UTC 2017 - aloisio@gmx.com diff --git a/mpv.spec b/mpv.spec index bcaac19..1411d16 100644 --- a/mpv.spec +++ b/mpv.spec @@ -159,7 +159,7 @@ video player. It features... Summary: ZSH Completion for %{name} License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players -Requires: %{name} = %{version} +Requires: %{name} = %{_mpv_ver} Supplements: packageand(mpv:zsh) BuildArch: noarch @@ -170,7 +170,7 @@ ZSH command line completion support for %{name}. Summary: A library to link together with mpv player License: GPL-2.0+ 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 From 8e7dbb4239f9df14d02f25b7e665a9d535dfb5894bdf5599e8bf2da503eaa318 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 19 Jan 2017 19:39:51 +0000 Subject: [PATCH 8/9] Accepting request 451478 from home:alois:branches:multimedia:apps Updated embedded mpv-bash-completion OBS-URL: https://build.opensuse.org/request/show/451478 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=79 --- mpv-bash-completion-3.3.7.tar.gz | 3 --- mpv-bash-completion-3.3.8.tar.gz | 3 +++ mpv.changes | 8 ++++++++ mpv.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 mpv-bash-completion-3.3.7.tar.gz create mode 100644 mpv-bash-completion-3.3.8.tar.gz diff --git a/mpv-bash-completion-3.3.7.tar.gz b/mpv-bash-completion-3.3.7.tar.gz deleted file mode 100644 index d90c721..0000000 --- a/mpv-bash-completion-3.3.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8eb7f516539b0a1b9221088ba0e6676bda63746432ce1c7ec7a2dd91c3dff766 -size 18986 diff --git a/mpv-bash-completion-3.3.8.tar.gz b/mpv-bash-completion-3.3.8.tar.gz new file mode 100644 index 0000000..575022b --- /dev/null +++ b/mpv-bash-completion-3.3.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67bb3565daafb1e3f64b24262b0859f7843ac052960e0159e3fe3a375ffed181 +size 19002 diff --git a/mpv.changes b/mpv.changes index ef5d9a8..3529f53 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 19 18:25:26 UTC 2017 - aloisio@gmx.com + +- Updated embedded mpv-bash-completion to 3.3.8 + * FIXED: --{ and --} got treated as flags, completing to + --{=yes|no and --}=yes|no, respectively, due to a change in + upstream option typing, which is a command line syntax error. + ------------------------------------------------------------------- Tue Jan 3 19:49:41 UTC 2017 - aloisio@gmx.com diff --git a/mpv.spec b/mpv.spec index 1411d16..a5fa2ff 100644 --- a/mpv.spec +++ b/mpv.spec @@ -19,7 +19,7 @@ # -%define _mbc_ver 3.3.7 +%define _mbc_ver 3.3.8 %define _mpv_ver 0.23.0 %define lname libmpv1 Name: mpv From 7d22f3b377a6f5efb53bb67fbd9c5c4eb1142bbae27c5b34036b01101165dfd7 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 20 Jan 2017 08:17:24 +0000 Subject: [PATCH 9/9] Accepting request 451483 from home:jengelh:branches:multimedia:apps - Fixup wrong description OBS-URL: https://build.opensuse.org/request/show/451483 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=80 --- mpv.changes | 5 +++++ mpv.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mpv.changes b/mpv.changes index 3529f53..fe92523 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 19 19:57:35 UTC 2017 - jengelh@inai.de + +- Fixup wrong description + ------------------------------------------------------------------- Thu Jan 19 18:25:26 UTC 2017 - aloisio@gmx.com diff --git a/mpv.spec b/mpv.spec index a5fa2ff..9626fcb 100644 --- a/mpv.spec +++ b/mpv.spec @@ -142,8 +142,7 @@ Supplements: packageand(mpv:bash) BuildArch: noarch %description bash-completion -A script for generating a Bash completion script for the popular mpv -video player. It features... +A Bash completion script for the mpv video player. It features * Completion for all --options, * Type-based completion for --option arguments for choices, flags, integers and floats,