Author: sergiomb
Update of /cvs/free/rpms/smplayer/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19847
Modified Files:
.cvsignore smplayer-0.8.3-desktop-files.patch
smplayer-0.8.5-system-qtsingleapplication.patch smplayer.spec
sources
Added Files:
smtube-2.1-system-qtsingleapplication.patch
Removed Files:
smplayer-0.8.1-system-quazip.patch
smtube-1.7-system-qtsingleapplication.patch
Log Message:
* Fri Apr 04 2014 Sérgio Basto <sergio(a)serjux.com> - 14.3.0-1
- New upstream release, Previous version was 0.8.6, this new release is 14.3...
What happened? Now the version is just the year and month of the release.
- Patches refactor.
smtube-2.1-system-qtsingleapplication.patch:
smtube.pro | 2 --
1 file changed, 2 deletions(-)
--- NEW FILE smtube-2.1-system-qtsingleapplication.patch ---
--- ./src/smtube.pro.qtsingleapplication 2014-04-04 04:15:52.637706286 +0100
+++ ./src/smtube.pro 2014-04-04 04:20:22.826212863 +0100
@@ -5,7 +5,6 @@
TEMPLATE = app
QT += network xml
TARGET = smtube
-INCLUDEPATH += qtsingleapplication
CONFIG += qt warn_on
CONFIG += release
@@ -17,7 +16,6 @@ RESOURCES = icons.qrc
DEFINES += NO_SMPLAYER_SUPPORT
DEFINES += YT_USE_SCRIPT
-DEFINES += USE_SINGLE_APPLICATION
isEqual(QT_MAJOR_VERSION, 5) {
QT += widgets gui
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-19/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 5 Oct 2013 00:40:14 -0000 1.20
+++ .cvsignore 5 Apr 2014 09:37:28 -0000 1.21
@@ -1,2 +1,2 @@
-smplayer-0.8.6.tar.bz2
-smtube-1.8.tar.bz2
+smplayer-14.3.0.tar.bz2
+smtube-2.1.tar.bz2
smplayer-0.8.3-desktop-files.patch:
smplayer.desktop | 2 +-
smplayer_enqueue.desktop | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: smplayer-0.8.3-desktop-files.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-19/smplayer-0.8.3-desktop-files.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smplayer-0.8.3-desktop-files.patch 25 Mar 2013 23:45:42 -0000 1.2
+++ smplayer-0.8.3-desktop-files.patch 5 Apr 2014 09:37:28 -0000 1.3
@@ -1,21 +1,21 @@
---- smplayer.desktop.orig 2013-01-09 23:37:52.000000000 +0000
-+++ smplayer.desktop 2013-03-25 21:58:19.197931695 +0000
-@@ -13,7 +13,7 @@ Comment[ru]=ÐПÑÐœÑй ОМÑеÑÑеÐ
+--- smplayer.desktop.orig 2014-04-04 03:44:38.994597919 +0100
++++ smplayer.desktop 2014-04-04 03:45:22.580104539 +0100
+@@ -14,7 +14,7 @@ Comment[ru]=ÐПÑÐœÑй ОМÑеÑÑеÐ
Comment[uk]=ÐПÑÑжМОй ÑÐœÑеÑÑÐµÐ¹Ñ ÐŽÐŸ MPlayer
- Comment[eu]=MPlayerrentzako interfaze grafiko handi bat
+ Comment[eu]=MPlayer-entzako interfaze grafika 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.orig 2013-01-09 23:37:52.000000000 +0000
-+++ smplayer_enqueue.desktop 2013-03-25 21:58:19.197931695 +0000
+--- smplayer_enqueue.desktop.orig 2014-04-04 03:44:38.995597930 +0100
++++ smplayer_enqueue.desktop 2014-04-04 03:45:22.581104551 +0100
@@ -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;video/webm;
+
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;audio/aac;audio/flac;audio/ogg;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;video/webm;
Name=Enqueue in SMPlayer
smplayer-0.8.5-system-qtsingleapplication.patch:
smplayer.pro | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
Index: smplayer-0.8.5-system-qtsingleapplication.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-19/smplayer-0.8.5-system-qtsingleapplication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smplayer-0.8.5-system-qtsingleapplication.patch 12 May 2013 00:33:00 -0000 1.1
+++ smplayer-0.8.5-system-qtsingleapplication.patch 5 Apr 2014 09:37:28 -0000 1.2
@@ -1,5 +1,5 @@
---- ./src/smplayer.pro.qtsingleapplication 2013-05-11 18:48:18.057730407 +0100
-+++ ./src/smplayer.pro 2013-05-12 00:39:37.634213140 +0100
+--- ./src/smplayer.pro.qtsingleapplication 2014-03-21 00:12:48.000000000 +0000
++++ ./src/smplayer.pro 2014-04-04 03:57:26.564711177 +0100
@@ -3,6 +3,7 @@ LANGUAGE = C++
CONFIG += qt warn_on
@@ -8,7 +8,7 @@
#CONFIG += debug
QT += network xml
-@@ -263,15 +264,6 @@ FORMS = inputdvddirectory.ui logwindowba
+@@ -266,14 +267,6 @@ FORMS = inputdvddirectory.ui logwindowba
about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \
toolbareditor.ui multilineinputdialog.ui
@@ -17,10 +17,9 @@
- INCLUDEPATH += qtsingleapplication
- DEPENDPATH += qtsingleapplication
-
-- SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-- HEADERS += qtsingleapplication.h qtlocalpeer.h
+- SOURCES += qtsingleapplication/qtsingleapplication.cpp
qtsingleapplication/qtlocalpeer.cpp
+- HEADERS += qtsingleapplication/qtsingleapplication.h qtsingleapplication/qtlocalpeer.h
-}
--
+
# Find subtitles dialog
contains( DEFINES, FIND_SUBTITLES ) {
- DEFINES += DOWNLOAD_SUBS
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-19/smplayer.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- smplayer.spec 5 Oct 2013 00:40:14 -0000 1.33
+++ smplayer.spec 5 Apr 2014 09:37:28 -0000 1.34
@@ -1,7 +1,7 @@
-%global smtube_ver 1.8
+%global smtube_ver 2.1
Name: smplayer
-Version: 0.8.6
+Version: 14.3.0
Release: 1%{?dist}
Summary: A graphical frontend for mplayer
@@ -17,9 +17,8 @@
# 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
+Patch3: smtube-2.1-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
@@ -42,12 +41,12 @@
%setup -a3 -qn %{name}-%{version}
#remove some bundle sources
rm -rf zlib
-rm -rf src/findsubtitles/quazip
rm -rf src/qtsingleapplication/
rm -rf smtube-%{smtube_ver}/src/qtsingleapplication/
+#TODO unbundle libmaia
+#rm -rf src/findsubtitles/libmaia
%patch0 -p0 -b .desktop-files
-#patch1 -p1 -b .quazip
%patch2 -p1 -b .qtsingleapplication
pushd smtube-%{smtube_ver}
%patch3 -p1 -b .qtsingleapplication
@@ -131,6 +130,11 @@
%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%changelog
+* Fri Apr 04 2014 Sérgio Basto <sergio(a)serjux.com> - 14.3.0-1
+- New upstream release, Previous version was 0.8.6, this new release is 14.3...
+ What happened? Now the version is just the year and month of the release.
+- Patches refactor.
+
* Tue Oct 01 2013 Sérgio Basto <sergio(a)serjux.com> - 0.8.6-1
- Update smplayer to 0.8.6 and smtube to 1.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-19/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 5 Oct 2013 00:40:14 -0000 1.22
+++ sources 5 Apr 2014 09:37:28 -0000 1.23
@@ -1,2 +1,2 @@
-deddbce75049b5c4f15ec6c02eaf8790 smplayer-0.8.6.tar.bz2
-b80d4d085a8e7350619d65f0f0786037 smtube-1.8.tar.bz2
+c6ef86f7fe0022b35c0f06430f4cd9bd smplayer-14.3.0.tar.bz2
+9cd034d5abcbc66445478b5824af50f1 smtube-2.1.tar.bz2
--- smplayer-0.8.1-system-quazip.patch DELETED ---
--- smtube-1.7-system-qtsingleapplication.patch DELETED ---