Accepting request 334881 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/334881
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/smplayer?expand=0&rev=2

smplayer-14.9.0.6994.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4993f4d753f2982667e088d0f06fccd36535d8e65eff5acbef82d4cde132b301
-size 3872223

smplayer-15.9.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85a970df1c601f266101895e9bb9a17c20d1e964796fa590546527a9669ca6fb
+size 3874708

smplayer-default_pulse.patch

@@ -1,22 +1,22 @@
---- src/core.cpp.orig
+--- a/src/core.cpp
-+++ src/core.cpp
++++ b/src/core.cpp
-@@ -1698,6 +1698,8 @@
+@@ -1717,6 +1717,8 @@ void Core::startMplayer( QString file, d
  	if (pref->ao != "player_default") {
  		if (!pref->ao.isEmpty()) {
  			proc->setOption("ao", pref->ao );
 +		} else {
-+			proc->setOption("ao", "@@DEFAULT@@," );
++			proc->setOption("ao", "pulse," );
  		}
  	}
  
---- src/prefgeneral.cpp.orig
+--- a/src/prefgeneral.cpp
-+++ src/prefgeneral.cpp
++++ b/src/prefgeneral.cpp
-@@ -183,6 +183,9 @@
+@@ -193,6 +193,9 @@ void PrefGeneral::setData(Preferences *
  
  	QString ao = pref->ao;
  
 +	if (ao.isEmpty())
-+		ao = "@@DEFAULT@@,";
++		ao = "pulse,";
 +
  #ifdef Q_OS_OS2
  	if (ao.isEmpty()) {

smplayer.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Sep 29 22:10:04 UTC 2015 - sor.alexei@meowr.ru
+
+- Rename smplayer-default_ao.patch to smplayer-default_pulse.patch
+  and make respective changes.
+- Minor spec cleanup.
+
+-------------------------------------------------------------------
+Tue Sep 29 22:04:49 UTC 2015 - nemysis@openSUSE.org
+
+- Update to 15.9.0, please see
+
+  usr/share/doc/packages/smplayer/Changelog
+
 -------------------------------------------------------------------
 Wed Jun 17 14:24:43 UTC 2015 - sor.alexei@meowr.ru
 

smplayer.spec

@@ -17,23 +17,23 @@
 
 
 Name:           smplayer
-Version:        14.9.0.6994
+Version:        15.9.0
 Release:        0
 Summary:        Complete frontend for MPV
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            http://smplayer.sourceforge.net/
+Url:            http://smplayer.es/
-Source:         http://downloads.sf.net/smplayer/smplayer-%{version}.tar.bz2
+Source0:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE smplayer-makeflags.patch
-Patch0:         smplayer-makeflags.patch
+Patch0:         %{name}-makeflags.patch
-# PATCH-FIX-OPENSUSE smplayer-default_ao.patch
+# PATCH-FIX-OPENSUSE smplayer-default_pulse.patch
-Patch1:         smplayer-default_ao.patch
+Patch1:         %{name}-default_pulse.patch
 # PATCH-FEATURE-OPENSUSE smplayer-default_mpv.patch sor.alexei@meowr.ru -- Use MPV by default.
-Patch2:         smplayer-default_mpv.patch
+Patch2:         %{name}-default_mpv.patch
 # PATCH-FIX-UPSTREAM smplayer-simple-resize.patch
-Patch3:         smplayer-simple-resize.patch
+Patch3:         %{name}-simple-resize.patch
 # PATCH-FIX-UPSTREAM smplayer-add_kde_protocols_to_desktop_file.patch -- To play network shared video correctly: #PM-48.
-Patch4:         smplayer-add_kde_protocols_to_desktop_file.patch
+Patch4:         %{name}-add_kde_protocols_to_desktop_file.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libstdc++-devel
@@ -41,7 +41,7 @@ BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
 # Either mpv >= 0.6.2 or MPlayer >= 1.0rc4_r32607.
 Requires:       mpv >= 0.6.2
-Recommends:     smplayer-lang = %{version}
+Recommends:     smplayer-lang
 Recommends:     smplayer-skins
 Suggests:       smplayer-themes
 Provides:       smplayer-core = %{version}
@@ -80,15 +80,9 @@ settings: audio track, subtitles, volume...
 %lang_package
 
 %prep
-%setup -q -n smplayer-%{version}
+%setup -q
 %patch0
-%patch1
+%patch1 -p1
-sed -e '/^+\{3\}/!d;s|^+\{3\} \([^ ]*\).*$|\1|' < %{PATCH1} | xargs \
-%if 0%{?suse_version} >= 1210
-  sed -i 's/@@DEFAULT@@/pulse/g'
-%else
-  sed -i 's/@@DEFAULT@@/alsa/g'
-%endif
 %patch2
 %patch3
 %patch4
@@ -133,7 +127,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}/*
 for desktop in smplayer smplayer_enqueue; do
     %suse_update_desktop_file -r "$desktop" Qt AudioVideo Video Player
 done
-%find_lang smplayer --with-qt
+%find_lang %{name} --with-qt
 
 %post
 %desktop_database_post
@@ -146,19 +140,17 @@ done
 %files
 %defattr(-,root,root)
 %doc Changelog *.txt
-%{_bindir}/smplayer
+%{_bindir}/%{name}
-%{_datadir}/applications/smplayer.desktop
+%{_datadir}/applications/%{name}*.desktop
-%{_datadir}/applications/smplayer_enqueue.desktop
 %dir %{_datadir}/icons/hicolor/*/
 %dir %{_datadir}/icons/hicolor/*/apps/
-%{_datadir}/icons/hicolor/*/apps/smplayer.*
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
-%dir %{_datadir}/smplayer/
+%{_datadir}/%{name}/
-%{_datadir}/smplayer/shortcuts/
+%exclude %{_datadir}/%{name}/translations/
-%{_datadir}/smplayer/input.conf
+%{_mandir}/man?/%{name}.?%{?ext_man}
-%{_mandir}/man?/smplayer.?%{?ext_man}
 
-%files lang -f smplayer.lang
+%files lang -f %{name}.lang
 %defattr(-,root,root)
-%dir %{_datadir}/smplayer/translations/
+%dir %{_datadir}/%{name}/translations/
 
 %changelog