From 2b2185041377a44eb6cd5aff50afe8a1b92de95f3b76f5ba58854716c690ff86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 20 Mar 2018 09:38:44 +0000
Subject: [PATCH] - Do not enable smbclient twice, it is in normal opts too

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=136
---
 mpv.changes |  5 +++++
 mpv.spec    | 12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mpv.changes b/mpv.changes
index 2b3d60a..89e01ad 100644
--- a/mpv.changes
+++ b/mpv.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 20 09:38:17 UTC 2018 - tchvatal@suse.com
+
+- Do not enable smbclient twice, it is in normal opts too
+
 -------------------------------------------------------------------
 Wed Feb 14 09:33:34 UTC 2018 - aloisio@gmx.com
 
diff --git a/mpv.spec b/mpv.spec
index de75ae8..b076c50 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -27,7 +27,7 @@ Name:           mpv
 Version:        %{_mpv_ver}
 Release:        0
 Summary:        Advanced general-purpose multimedia player
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://mpv.io/
 Source:         http://github.com/mpv-player/%{name}/archive/v%{_mpv_ver}.tar.gz#/%{name}-%{_mpv_ver}.tar.gz
@@ -141,7 +141,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+
+License:        GPL-3.0-or-later
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name} = %{_mpv_ver}
 Requires:       bash-completion
@@ -164,7 +164,7 @@ A Bash completion script for the mpv video player. It features
 
 %package zsh-completion
 Summary:        ZSH Completion for %{name}
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name} = %{_mpv_ver}
 Supplements:    packageand(mpv:zsh)
@@ -175,7 +175,7 @@ ZSH command line completion support for %{name}.
 
 %package devel
 Summary:        A library to link together with mpv player
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       %{lname} = %{_mpv_ver}
 
@@ -187,7 +187,7 @@ This package contains all the development files.
 
 %package -n %{lname}
 Summary:        A library to link together with mpv player
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Libraries
 
 %description -n %{lname}
@@ -218,8 +218,6 @@ myopts="--disable-sdl1 --disable-sdl2"
 myopts+=" --disable-build-date"
 # Debug just adds -g and we do that over optflags anyway.
 myopts+=" --disable-debug"
-# Explicitly enable samba (seems non-default now?)
-myopts+=" --enable-libsmbclient"
 export CCFLAGS="%{optflags}"
 python3 ./waf configure \
   --prefix="%{_prefix}"              \