new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7853 ec354946-7b23-47d6-9f5a-488ba84defc7

s/smplayer/smplayer-vl.spec

@@ -1,9 +1,11 @@
 # define correct path to used binaries
-%define _qt4_qmake %{_libdir}/qt4/bin/qmake
-%define _qt4_lrelease %{_libdir}/qt4/bin/lrelease
+%global _qt4_qmake	%{_qt4_bindir}/qmake
+%global _qt4_lrelease	%{_qt4_bindir}/lrelease
+
+%global smtube_ver 1.8
 
 Name:           smplayer
-Version:        0.8.0
+Version:        0.8.6
 Release:        1%{?_dist_release}
 Summary:        A graphical frontend for mplayer
 Summary(ja):    MPlayerのグラフィカルフロントエンド
@@ -20,7 +22,14 @@ Source0:        http://downloads.sourceforge.net/sourceforge/smplayer/smplayer-%
 # Source2:        smplayer_enqueue_kde3.desktop
 # Fix regression in Thunar (TODO: re-check in upcoming versions!)
 # https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
-Patch0:         smplayer-0.8.0-desktop-files.patch
+Source3:        http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
+# Fix regression in Thunar (TODO: re-check in upcoming versions!)
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
+Patch0:         smplayer-0.8.3-desktop-files.patch
+# Patch1:         smplayer-0.8.1-system-quazip.patch
+# Patch2:         smplayer-0.8.5-system-qtsingleapplication.patch
+# Patch3:         smtube-1.7-system-qtsingleapplication.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  desktop-file-utils
@@ -39,7 +48,7 @@ the Qt toolkit, so it's multi-platform.
 #'
 
 %prep
-%setup -qn %{name}-%{version}
+%setup -a3 -qn %{name}-%{version}
 %patch0 -p0 -b .desktop-files
 
 # correction for wrong-file-end-of-line-encoding
@@ -48,9 +57,6 @@ the Qt toolkit, so it's multi-platform.
 iconv -f Latin1 -t UTF-8 -o Changelog.utf8 Changelog 
 %__mv Changelog.utf8 Changelog
 
-# use lrelease from qt4-devel
-%__sed -i 's|LRELEASE=lrelease|LRELEASE=%{_qt4_lrelease}|' Makefile
-
 # fix path of docs
 %__sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile
 
@@ -61,12 +67,23 @@ iconv -f Latin1 -t UTF-8 -o Changelog.utf8 Changelog
 echo "NotShowIn=KDE;" >> smplayer_enqueue.desktop
 
 %build
-%__make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
+%__make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_qt4_lrelease}
+
+pushd smtube-%{smtube_ver}
+sed -i 's|/usr/local|%{_prefix}|' Makefile
+sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
+sed -i 's|smtube/translations|smplayer/translations|' Makefile
+make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_qt4_lrelease}
+popd
 
 %install
 %__rm -rf %{buildroot}
 %__make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install
 
+pushd smtube-%{smtube_ver}
+%__make install DESTDIR=%{buildroot}
+popd
+
 desktop-file-install --delete-original                   \
         --vendor "vine"                             \
         --dir %{buildroot}%{_datadir}/applications/      \
@@ -108,8 +125,11 @@ update-desktop-database &> /dev/null || :
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/
 %{_bindir}/smplayer
+%{_bindir}/smtube
 %{_datadir}/applications/*-smplayer*.desktop
-%{_datadir}/icons/hicolor/*/apps/smplayer.png
+%{_datadir}/applications/smtube.desktop
+%{_datadir}/icons/hicolor/*/apps/smplayer.*
+%{_datadir}/icons/hicolor/*/apps/smtube.*
 %{_datadir}/smplayer/
 %{_mandir}/man1/smplayer.1.gz