Accepting request 589033 from multimedia:apps

- Do not enable smbclient twice, it is in normal opts too

OBS-URL: https://build.opensuse.org/request/show/589033
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpv?expand=0&rev=45

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
 

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}"              \
@@ -279,8 +277,8 @@ sed -i -e '1d' %{buildroot}%{_datadir}/bash-completion/completions/mpv
 %postun -n %{lname} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%license LICENSE
-%doc Copyright LICENSE README.md RELEASE_NOTES
+%doc Copyright README.md RELEASE_NOTES
 %doc %{_defaultdocdir}/%{name}/input.conf
 %doc %{_defaultdocdir}/%{name}/mplayer-input.conf
 %doc %{_defaultdocdir}/%{name}/mpv.conf
@@ -296,20 +294,17 @@ sed -i -e '1d' %{buildroot}%{_datadir}/bash-completion/completions/mpv
 %{_mandir}/man?/%{name}.?%{?ext_man}
 
 %files zsh-completion
-%defattr(-,root,root)
 %{_datadir}/zsh/site-functions/_mpv
 
 %files bash-completion
-%defattr(-,root,root)
+%license mpv-bash-completion-%{_mbc_ver}/LICENSE
-%doc mpv-bash-completion-%{_mbc_ver}/LICENSE mpv-bash-completion-%{_mbc_ver}/README.mkd
+%doc mpv-bash-completion-%{_mbc_ver}/README.mkd
 %{_datadir}/bash-completion/completions/mpv
 
 %files -n %{lname}
-%defattr(-,root,root)
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/%{name}/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc