commit d1f1b67ffaa96f45899a32102a0a972fa553a280 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Thu Jan 26 01:05:52 2017 +0000 copy master in el7 .gitignore | 21 +- ...er-14.9.0.6966-system-qtsingleapplication.patch | 10 +- smplayer.spec | 292 ++++++++++++++++----- smplayer_enqueue_kde4.desktop | 18 -- smtube-16.3.0-system-qtsingleapplication.patch | 18 ++ smtube-2.1-system-qtsingleapplication.patch | 18 -- sources | 6 +- 7 files changed, 269 insertions(+), 114 deletions(-) --- diff --git a/.gitignore b/.gitignore index 6e4c1ed..112a6ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,19 @@ -smplayer-14.9.0.tar.bz2 -smtube-14.8.0.tar.bz2 +smplayer-15.9.0.tar.bz2 +smtube-15.9.0.tar.bz2 +smplayer-15.11.0.tar.bz2 +smtube-15.11.0.tar.bz2 +smplayer-16.1.0.tar.bz2 +smtube-16.1.0.tar.bz2 +smplayer-16.4.0.tar.bz2 +smtube-16.3.0.tar.bz2 +/smplayer-16.6.0.tar.bz2 +/smtube-16.6.0.tar.bz2 +/smplayer-themes-16.6.0.tar.bz2 +/smplayer-skins-15.2.0.tar.bz2 +/smtube-16.7.2.tar.bz2 +/smplayer-16.7.0.tar.bz2 +/smplayer-16.8.0.tar.bz2 +/smplayer-16.9.0.tar.bz2 +/smplayer-themes-16.8.0.tar.bz2 +/smplayer-16.11.0.tar.bz2 +/smplayer-17.1.0.tar.bz2 diff --git a/smplayer-0.8.5-system-qtsingleapplication.patch b/smplayer-14.9.0.6966-system-qtsingleapplication.patch similarity index 62% rename from smplayer-0.8.5-system-qtsingleapplication.patch rename to smplayer-14.9.0.6966-system-qtsingleapplication.patch index 19cc106..f72b23b 100644 --- a/smplayer-0.8.5-system-qtsingleapplication.patch +++ b/smplayer-14.9.0.6966-system-qtsingleapplication.patch @@ -1,5 +1,5 @@ ---- ./src/smplayer.pro.qtsingleapplication 2014-03-21 00:12:48.000000000 +0000 -+++ ./src/smplayer.pro 2014-04-04 03:57:26.564711177 +0100 +--- ./src/smplayer.pro.orig 2015-08-03 22:54:00.000000000 +0100 ++++ ./src/smplayer.pro 2015-10-02 22:07:32.679161412 +0100 @@ -3,6 +3,7 @@ LANGUAGE = C++ CONFIG += qt warn_on @@ -8,9 +8,9 @@ #CONFIG += debug QT += network xml -@@ -266,14 +267,6 @@ FORMS = inputdvddirectory.ui logwindowba - about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \ - toolbareditor.ui multilineinputdialog.ui +@@ -309,14 +310,6 @@ contains( DEFINES, MPLAYER_SUPPORT ) { + SOURCES += mplayerprocess.cpp inforeadermplayer.cpp + } -# qtsingleapplication -contains( DEFINES, SINGLE_INSTANCE ) { diff --git a/smplayer.spec b/smplayer.spec index a8e4fe6..4425f98 100644 --- a/smplayer.spec +++ b/smplayer.spec @@ -1,33 +1,56 @@ -%global smtube_ver 14.8.0 - Name: smplayer -Version: 14.9.0 +Version: 17.1.0 +%global smtube_ver 16.7.2 +%global smplayer_themes_ver 16.8.0 +%global smplayer_skins_ver 15.2.0 Release: 1%{?dist} Summary: A graphical frontend for mplayer Group: Applications/Multimedia License: GPLv2+ -URL: http://smplayer.sourceforge.net/linux/ +URL: http://smplayer.sourceforge.net/ Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2 -# Add a servicemenu to enqeue files in smplayer's playlist. -# see also: -# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052... -Source1: smplayer_enqueue_kde4.desktop -Source3: http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2 +Source2: http://downloads.sourceforge.net/smtube/smtube-%{smtube_ver}.tar.bz2 +Source3: http://downloads.sourceforge.net/smplayer/smplayer-themes-%{smplayer_them... +Source4: http://downloads.sourceforge.net/smplayer/smplayer-skins-%{smplayer_skins... # 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 -Patch2: smplayer-0.8.5-system-qtsingleapplication.patch -Patch3: smtube-2.1-system-qtsingleapplication.patch +Patch2: smplayer-14.9.0.6966-system-qtsingleapplication.patch +Patch3: smtube-16.3.0-system-qtsingleapplication.patch BuildRequires: desktop-file-utils -BuildRequires: qt4-devel -BuildRequires: quazip-devel -BuildRequires: qtsingleapplication-devel +BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(zlib) +BuildRequires: qt5-linguist +BuildRequires: qtsingleapplication-qt5-devel +BuildRequires: quazip-qt5-devel +# for smtube only +BuildRequires: pkgconfig(Qt5WebKit) # smplayer without mplayer is quite useless -Requires: mplayer -Requires: kde-filesystem -%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} +Requires: mplayer-backend +Requires: hicolor-icon-theme +%if 0%{fedora} +Recommends: smtube +Recommends: mplayer +%endif + +%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} + +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils %description smplayer intends to be a complete front-end for Mplayer, from basic features @@ -37,99 +60,230 @@ remember the state of a played file, so when you play it later it will resume at the same point and with the same settings. smplayer is developed with the Qt toolkit, so it's multi-platform. +%package -n smtube +Summary: YouTube browser for SMPlayer +Group: Applications/Multimedia +License: GPLv2+ +URL: http://www.smtube.org +%if 0%{fedora} +Recommends: smplayer +%endif + +%description -n smtube +This is a YouTube browser for SMPlayer. You can browse, search +and play YouTube videos. + +%package themes +Summary: Themes and Skins for SMPlayer +Group: Video/Players +Requires: smplayer + +%description themes +A set of themes for SMPlayer and a set of skins for SMPlayer. + %prep -%setup -a3 -qn %{name}-%{version} -#remove some bundle sources +%setup -qa2 -qa3 -qa4 -qn %{name}-%{version} +#remove some bundle sources rm -rf zlib rm -rf src/qtsingleapplication/ rm -rf smtube-%{smtube_ver}/src/qtsingleapplication/ -#TODO unbundle libmaia +#TODO unbundle libmaia #rm -rf src/findsubtitles/libmaia %patch0 -p0 -b .desktop-files %patch2 -p1 -b .qtsingleapplication pushd smtube-%{smtube_ver} %patch3 -p1 -b .qtsingleapplication +# correction for wrong-file-end-of-line-encoding on smtube +%{__sed} -i 's/\r//' *.txt popd # correction for wrong-file-end-of-line-encoding %{__sed} -i 's/\r//' *.txt -# fix files which are not UTF-8 -iconv -f Latin1 -t UTF-8 -o Changelog.utf8 Changelog +# fix files which are not UTF-8 +iconv -f Latin1 -t UTF-8 -o Changelog.utf8 Changelog mv Changelog.utf8 Changelog -# fix path of docs -sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile - -# use %{?_smp_mflags} -sed -i '/cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make/s!$! %{?_smp_mflags}!' Makefile - -# don't show smplayer_enqueue.desktop in KDE and use servicemenus instead -echo "NotShowIn=KDE;" >> smplayer_enqueue.desktop +# change rcc binary +%{__sed} -e 's/rcc -binary/rcc-qt5 -binary/' -i smplayer-themes-%{smplayer_themes_ver}/themes/Makefile +%{__sed} -e 's/rcc -binary/rcc-qt5 -binary/' -i smplayer-skins-%{smplayer_skins_ver}/themes/Makefile %build -make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt4 +pushd src + %{qmake_qt5} + %make_build DATA_PATH=\\\"%{_datadir}/%{name}\\\" \ + TRANSLATION_PATH=\\\"%{_datadir}/%{name}/translations\\\" \ + DOC_PATH=\\\"%{_docdir}/%{name}\\\" \ + THEMES_PATH=\\\"%{_datadir}/%{name}/themes\\\" \ + SHORTCUTS_PATH=\\\"%{_datadir}/%{name}/shortcuts\\\" + %{_bindir}/lrelease-qt5 %{name}.pro +popd -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=%{_bindir}/lrelease-qt4 +pushd smtube-%{smtube_ver}/src + %{qmake_qt5} + %make_build TRANSLATION_PATH=\\\"%{_datadir}/smtube/translations\\\" + %{_bindir}/lrelease-qt5 smtube.pro +popd + +pushd smplayer-themes-%{smplayer_themes_ver} + %make_build popd +pushd smplayer-skins-%{smplayer_skins_ver} + mv README.txt README-skins.txt + mv Changelog Changelog-skins.txt + %make_build +popd %install -make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install -pushd smtube-%{smtube_ver} -make install DESTDIR=%{buildroot} -popd +%make_install PREFIX=%{_prefix} DOC_PATH=%{_docdir}/%{name} -desktop-file-install --delete-original \ - --vendor "rpmfusion" \ - --dir %{buildroot}%{_datadir}/applications/ \ - %{buildroot}%{_datadir}/applications/%{name}.desktop +# License docs go to another place +rm -r %{buildroot}%{_docdir}/%{name}/Copying* +pushd smtube-%{smtube_ver} + %make_install PREFIX=%{_prefix} DOC_PATH=%{_docdir}/%{name}/smtube +popd -desktop-file-install --delete-original \ - --vendor "rpmfusion" \ - --dir %{buildroot}%{_datadir}/applications/ \ - %{buildroot}%{_datadir}/applications/%{name}_enqueue.desktop +pushd smplayer-themes-%{smplayer_themes_ver} + %make_install PREFIX=%{_prefix} +popd -desktop-file-validate %{buildroot}%{_datadir}/applications/smtube.desktop +pushd smplayer-skins-%{smplayer_skins_ver} + %make_install PREFIX=%{_prefix} +popd -# Add servicemenus dependend on the version of KDE: -# https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&... -install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %post -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi -update-desktop-database &> /dev/null || : +/usr/bin/update-desktop-database &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/usr/bin/update-desktop-database &> /dev/null || : +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -update-desktop-database &> /dev/null || : + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%{_docdir}/%{name}-%{version}/ +%license Copying* %{_bindir}/smplayer -%{_bindir}/smtube -%{_datadir}/applications/rpmfusion-smplayer*.desktop -%{_datadir}/applications/smtube.desktop +%{_datadir}/applications/smplayer*.desktop %{_datadir}/icons/hicolor/*/apps/smplayer.png %{_datadir}/icons/hicolor/*/apps/smplayer.svg +%{_datadir}/smplayer +%exclude %{_datadir}/smplayer/themes/ +%{_mandir}/man1/%{name}.1.* +%{_docdir}/%{name} + +%files -n smtube +%doc smtube-%{smtube_ver}/Changelog smtube-%{smtube_ver}/Readme.txt +%doc smtube-%{smtube_ver}/Release_notes.txt +%license smtube-%{smtube_ver}/Copying.txt +%{_bindir}/smtube +%{_datadir}/applications/smtube.desktop %{_datadir}/icons/hicolor/*/apps/smtube.png -%{_datadir}/smplayer/ -%{_mandir}/man1/smplayer.1.gz -%dir %{_datadir}/kde4/services/ServiceMenus/ -%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop +%{_datadir}/smtube + +%files themes +%doc smplayer-themes-%{smplayer_themes_ver}/README.txt +%doc smplayer-themes-%{smplayer_themes_ver}/Changelog +%doc smplayer-skins-%{smplayer_skins_ver}/README-skins.txt +%doc smplayer-skins-%{smplayer_skins_ver}/Changelog-skins.txt +%license smplayer-themes-%{smplayer_themes_ver}/COPYING* +%{_datadir}/smplayer/themes/ %changelog +* Tue Jan 24 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 17.1.0-1 +- Update smplayer to 17.1.0 + +* Wed Nov 16 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.11.0-2 +- Test weak_deps on RPM Fusion + +* Sun Nov 06 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.11.0-1 +- Update smplayer to 16.11.0 and themes to 16.8.0 +- Weak deps is not working in RPMFusion packages + +* Sat Nov 05 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 16.9.0-2 +- Add requires mplayer-backend (rfbz#4284) + +* Sat Sep 10 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.9.0-1 +- Update smplayer tp 16.9.0 + +* Tue Aug 16 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.8.0-4 +- Fix translation. + +* Tue Aug 16 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.8.0-3 +- More reviews, with Vascom, rfbz #4187, fix cflags in builds + +* Tue Aug 09 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.8.0-2 +- Recommends mplayer instead Requires, rfbz #4068 + +* Mon Aug 08 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.8.0-1 +- Update smplayer tp 16.8.0 +- Separate smtube package rfbz #4171 + +* Sat Jul 23 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.7.0-3 +- Package scriplets review, based on RussianFedora work + https://github.com/RussianFedora/smplayer + +* Tue Jul 19 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.7.0-2 +- Add patch to fix build in rawhide + +* Sun Jul 17 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.7.0-1 +- Update smplayer to 16.7.0 and smtube to 16.7.2 +- Install smplayer-themes and smplayer-skins +- Few more cleanup, especially in docs and licenses. + +* Sun Jul 17 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.6.0-2 +- Switch builds to Qt5 +- Do not apply a vendor tag to .desktop files (using --vendor). +- Drop old smplayer_enqueue.desktop + +* Wed Jun 22 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.6.0-1 +- Update to 16.6.0 + +* Fri Apr 01 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.4.0-1 +- Update to 16.4.0 + +* Sun Jan 17 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 16.1.0-1 +- Update 16.1.0 + +* Sun Dec 06 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 15.11.0-1 +- Update smplayer and smtube 15.11.0 + +* Fri Oct 02 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 15.9.0-1 +- Update smplayer to 15.9.0 and smtube to 15.9.0 . + +* Thu Aug 20 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0.6994-2 +- Update smtube to 15.8.0 . +- Removed version of package from _docdir directory (following the guidelines). + +* Wed Jun 17 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0.6994-1 +- Update to 4.9.0.6994 . +- Drop smplayer-14.9.0-get_svn_revision.patch . + +* Mon Jun 08 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0.6966-3 +- Added smplayer-14.9.0-get_svn_revision.patch, I think is better have a + hardcore version than (svn r0UNKNOWN) + +* Sun Jun 07 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0.6966-2 +- Update to smtube-15.5.17 + +* Sat Jun 06 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0.6966-1 +- Update to smplayer-14.9.0.6966 and smtube-15.5.10 +- Fix warning "The desktop entry file "ServiceMenus/smplayer_enqueue.desktop + has an empty mimetype! " . +- Rebase patches 2 and 3 . + +* Wed Mar 25 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0.6690-1 +- Update smplayer to smplayer-14.9.0.6690 and smtube to smtube-15.1.26 + * Mon Sep 15 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0-1 - New upstream releases smplayer 14.9.0 and smtube 14.8.0 - Rebase patches 1 and 3 . diff --git a/smtube-16.3.0-system-qtsingleapplication.patch b/smtube-16.3.0-system-qtsingleapplication.patch new file mode 100644 index 0000000..cc9eb73 --- /dev/null +++ b/smtube-16.3.0-system-qtsingleapplication.patch @@ -0,0 +1,18 @@ +--- ./src/smtube.pro.orig 2016-04-01 18:54:03.886383500 +0100 ++++ ./src/smtube.pro 2016-04-01 18:56:29.971081551 +0100 +@@ -1,6 +1,7 @@ + + TEMPLATE = app + QT += network ++INCLUDEPATH += qtsingleapplication + + CONFIG += release + #CONFIG += debug +@@ -9,6 +10,7 @@ DEFINES += USE_PLAYERS + DEFINES += YT_USE_SCRIPT + DEFINES += D_BUTTON + DEFINES += STYLE_SWITCHING ++DEFINES += USE_SINGLE_APPLICATION + + DEFINES += D_PLAYERS + diff --git a/sources b/sources index 2ab681b..c802366 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ -34bd6762f684064bafdaea0afa4e2d40 smplayer-14.9.0.tar.bz2 -21d9341a1a5de13a7064296f6625d399 smtube-14.8.0.tar.bz2 +30dde6d9ee016879b121d4d28a427b2a smplayer-themes-16.8.0.tar.bz2 +57e165cf9a95808fafd179e5322b7f15 smplayer-skins-15.2.0.tar.bz2 +318369359ae36a2fce92939f56291f3e smtube-16.7.2.tar.bz2 +aa28e0ec45bc184e4304700313a8f6e9 smplayer-17.1.0.tar.bz2