Author: sergiomb Update of /cvs/free/rpms/smplayer/F-15 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24187 Modified Files: .cvsignore smplayer.spec sources Added Files: smplayer-0.8.0-desktop-files.patch smplayer-0.8.0-system-qtsingleapplication.patch smplayer-0.8.0-system-quazip.patch Removed Files: smplayer-0.6.9-desktop-files.patch smplayer-0.7.0-system-quazip.patch smplayer_enqueue_kde3.desktop Log Message: * Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.8.0-2 - fix smtube translations. - drop support for Fedora < 9 and EPEL 5, since we need kde4. * Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.8.0-1 - New release - add smtube support - use system qtsingleapplication - a little review with: fedora-review -n smplayer --mock-config fedora-16-i386 smplayer-0.8.0-desktop-files.patch: smplayer.desktop | 2 +- smplayer_enqueue.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE smplayer-0.8.0-desktop-files.patch --- --- smplayer.desktop 2012-03-23 09:57:49.000000000 +0200 +++ smplayer.desktop 2012-04-06 04:39:05.971492030 +0300 @@ -13,7 +13,7 @@ Comment[uk]=Потужний інтерфейс до MPlayer Comment[eu]=MPlayerrentzako interfaze grafiko handi bat Comment[zh_CN]=一个优秀的 MPlayer 前端 -Exec=smplayer %U +Exec=smplayer %f GenericName=Media Player GenericName[cs]=Přehrávač multimédií GenericName[es]=Reproductor multimedia --- smplayer_enqueue.desktop 2012-03-23 09:57:49.000000000 +0200 +++ smplayer_enqueue.desktop 2012-04-06 04:39:16.295388149 +0300 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Qt;KDE;AudioVideo;Player;Video; -Exec=smplayer -add-to-playlist %U +Exec=smplayer -add-to-playlist %F Icon=smplayer MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora; Name=Enqueue in SMPlayer smplayer-0.8.0-system-qtsingleapplication.patch: smtube-1.1/src/smtube.pro | 9 +++------ src/smplayer.pro | 10 +--------- 2 files changed, 4 insertions(+), 15 deletions(-) --- NEW FILE smplayer-0.8.0-system-qtsingleapplication.patch --- --- smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-03-27 00:46:29.000000000 +0300 +++ smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-04-06 04:46:13.911416527 +0300 @@ -5,10 +5,11 @@ TEMPLATE = app QT += network xml TARGET = -DEPENDPATH += . qtsingleapplication -INCLUDEPATH += . qtsingleapplication +DEPENDPATH += . +INCLUDEPATH += . CONFIG += qt warn_on release +CONFIG += qtsingleapplication RESOURCES = icons.qrc @@ -61,10 +62,6 @@ translations/smtube_eu.ts \ translations/smtube_pt.ts -# qtsingleapplication -SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp -HEADERS += qtsingleapplication.h qtlocalpeer.h - unix { UI_DIR = .ui MOC_DIR = .moc --- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300 +++ smplayer-0.8.0/src/smplayer.pro 2012-04-06 04:44:47.313246489 +0300 @@ -3,6 +3,7 @@ CONFIG += qt warn_on CONFIG += release +CONFIG += qtsingleapplication #CONFIG += debug QT += network xml @@ -235,15 +236,6 @@ about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \ toolbareditor.ui -# qtsingleapplication -contains( DEFINES, SINGLE_INSTANCE ) { - INCLUDEPATH += qtsingleapplication - DEPENDPATH += qtsingleapplication - - SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp - HEADERS += qtsingleapplication.h qtlocalpeer.h -} - # Find subtitles dialog contains( DEFINES, FIND_SUBTITLES ) { DEFINES += DOWNLOAD_SUBS smplayer-0.8.0-system-quazip.patch: findsubtitles/findsubtitles.pro | 20 ++------------------ smplayer.pro | 22 ++++------------------ 2 files changed, 6 insertions(+), 36 deletions(-) --- NEW FILE smplayer-0.8.0-system-quazip.patch --- --- smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-03-31 15:46:16.000000000 +0300 +++ smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-04-27 21:58:55.535383047 +0300 @@ -34,30 +34,14 @@ DEFINES += NO_SMPLAYER_SUPPORT DOWNLOAD_SUBS contains( DEFINES, DOWNLOAD_SUBS ) { - INCLUDEPATH += filedownloader quazip - DEPENDPATH += filedownloader quazip + INCLUDEPATH += filedownloader + DEPENDPATH += filedownloader HEADERS += filedownloader.h subchooserdialog.h SOURCES += filedownloader.cpp subchooserdialog.cpp FORMS += subchooserdialog.ui - HEADERS += crypt.h \ - ioapi.h \ - quazip.h \ - quazipfile.h \ - quazipfileinfo.h \ - quazipnewinfo.h \ - unzip.h \ - zip.h - - SOURCES += ioapi.c \ - quazip.cpp \ - quazipfile.cpp \ - quazipnewinfo.cpp \ - unzip.c \ - zip.c - LIBS += -lz win32 { --- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300 +++ smplayer-0.8.0/src/smplayer.pro 2012-04-27 22:03:15.636757443 +0300 @@ -258,31 +258,17 @@ # Download subtitles contains( DEFINES, DOWNLOAD_SUBS ) { - INCLUDEPATH += findsubtitles/filedownloader findsubtitles/quazip - DEPENDPATH += findsubtitles/filedownloader findsubtitles/quazip + INCLUDEPATH += findsubtitles/filedownloader + DEPENDPATH += findsubtitles/filedownloader HEADERS += filedownloader.h subchooserdialog.h fixsubs.h SOURCES += filedownloader.cpp subchooserdialog.cpp fixsubs.cpp FORMS += subchooserdialog.ui - HEADERS += crypt.h \ - ioapi.h \ - quazip.h \ - quazipfile.h \ - quazipfileinfo.h \ - quazipnewinfo.h \ - unzip.h \ - zip.h + INCLUDEPATH += /usr/include/quazip /usr/include/minizip - SOURCES += ioapi.c \ - quazip.cpp \ - quazipfile.cpp \ - quazipnewinfo.cpp \ - unzip.c \ - zip.c - - LIBS += -lz + LIBS += -lz -lquazip win32 { INCLUDEPATH += ..\\zlib-1.2.6 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/smplayer/F-15/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 24 Mar 2012 03:21:15 -0000 1.12 +++ .cvsignore 6 May 2012 21:33:43 -0000 1.13 @@ -1 +1,2 @@ -smplayer-0.7.1.tar.bz2 +smplayer-0.8.0.tar.bz2 +smtube-1.1.tar.bz2 Index: smplayer.spec =================================================================== RCS file: /cvs/free/rpms/smplayer/F-15/smplayer.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- smplayer.spec 24 Mar 2012 03:21:15 -0000 1.15 +++ smplayer.spec 6 May 2012 21:33:43 -0000 1.16 @@ -1,35 +1,29 @@ -# define correct path to used binaries -# works on: fedora >= 7, centos >= 5 -%if 0%{?rhel} > 1 - %define _qt4_qmake %{_libdir}/qt4/bin/qmake - %define _qt4_lrelease %{_libdir}/qt4/bin/lrelease -%else - %define _qt4_lrelease %{_bindir}/lrelease-qt4 -%endif +%global smtube_ver 1.1 Name: smplayer -Version: 0.7.1 -Release: 1%{?dist} +Version: 0.8.0 +Release: 2%{?dist} Summary: A graphical frontend for mplayer Group: Applications/Multimedia License: GPLv2+ URL: http://smplayer.sourceforge.net/linux/ -Source0: http://downloads.sourceforge.net/sourceforge/smplayer/smplayer-%{version}... +Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2 # Add a servicemenu to enqeue files in smplayer's playlist. -# The first one is for KDE4, the second one for KDE3. # see also: # https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052... Source1: smplayer_enqueue_kde4.desktop -Source2: smplayer_enqueue_kde3.desktop +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.6.9-desktop-files.patch -Patch1: smplayer-0.7.0-system-quazip.patch +Patch0: smplayer-0.8.0-desktop-files.patch +Patch1: smplayer-0.8.0-system-quazip.patch +Patch2: smplayer-0.8.0-system-qtsingleapplication.patch BuildRequires: desktop-file-utils BuildRequires: qt4-devel BuildRequires: quazip-devel +BuildRequires: qtsingleapplication-devel # smplayer without mplayer is quite useless Requires: mplayer Requires: kde-filesystem @@ -44,11 +38,15 @@ %prep %setup -qn %{name}-%{version} +%setup -a3 -qn %{name}-%{version} #remove some bundle sources rm -rf zlib-1.2.6 rm -rf src/findsubtitles/quazip +rm -rf src/qtsingleapplication/ + %patch0 -p0 -b .desktop-files %patch1 -p1 -b .quazip +%patch2 -p1 -b .qtsingleapplication # correction for wrong-file-end-of-line-encoding %{__sed} -i 's/\r//' *.txt @@ -57,7 +55,7 @@ mv Changelog.utf8 Changelog # use lrelease from qt4-devel -sed -i 's|LRELEASE=lrelease|LRELEASE=%{_qt4_lrelease}|' Makefile +sed -i 's|LRELEASE=lrelease|LRELEASE=%{_bindir}/lrelease-qt4|' Makefile # fix path of docs sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile @@ -71,9 +69,21 @@ %build make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} +pushd smtube-%{smtube_ver} +sed -i 's|lrelease|%{_bindir}/lrelease-qt4|' Makefile +sed -i 's|qmake|%{_qt4_qmake}|' Makefile +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 PREFIX=%{_prefix} +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 "rpmfusion" \ @@ -86,17 +96,11 @@ --dir %{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applications/%{name}_enqueue.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/smtube.desktop + # Add servicemenus dependend on the version of KDE: # https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&... -%if 0%{?fedora} >= 9 - install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop -%else - install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop -%endif - - -%clean -rm -rf %{buildroot} +install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop %post touch --no-create %{_datadir}/icons/hicolor @@ -113,24 +117,29 @@ update-desktop-database &> /dev/null || : %files -%defattr(-,root,root,-) %{_docdir}/%{name}-%{version}/ %{_bindir}/smplayer +%{_bindir}/smtube %{_datadir}/applications/rpmfusion-smplayer*.desktop +%{_datadir}/applications/smtube.desktop %{_datadir}/icons/hicolor/*/apps/smplayer.png +%{_datadir}/icons/hicolor/*/apps/smtube.png %{_datadir}/smplayer/ %{_mandir}/man1/smplayer.1.gz - -%if 0%{?fedora} >= 9 - %dir %{_datadir}/kde4/services/ServiceMenus/ - %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop -%else - %dir %{_datadir}/apps/konqueror/ - %dir %{_datadir}/apps/konqueror/servicemenus/ - %{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop -%endif +%dir %{_datadir}/kde4/services/ServiceMenus/ +%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop %changelog +* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.8.0-2 +- fix smtube translations. +- drop support for Fedora < 9 and EPEL 5, since we need kde4. + +* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.8.0-1 +- New release +- add smtube support +- use system qtsingleapplication +- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386 + * Sat Mar 24 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.7.1-1 - New upstream version: 0.7.1, changelog says "This version includes some bug fixes, some of them important. It's highly recommended to update." Index: sources =================================================================== RCS file: /cvs/free/rpms/smplayer/F-15/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 24 Mar 2012 03:21:15 -0000 1.12 +++ sources 6 May 2012 21:33:43 -0000 1.13 @@ -1 +1,2 @@ -e50046399ee918bb7b57e98971425c95 smplayer-0.7.1.tar.bz2 +8f7d3a9c116e956c68976d0e5dbb83dd smplayer-0.8.0.tar.bz2 +e5018fcd9ebdc08658136476ba4843d2 smtube-1.1.tar.bz2 --- smplayer-0.6.9-desktop-files.patch DELETED --- --- smplayer-0.7.0-system-quazip.patch DELETED --- --- smplayer_enqueue_kde3.desktop DELETED ---