rpms/smplayer/F-17 smplayer-0.8.5-system-qtsingleapplication.patch, NONE, 1.1 smtube-1.7-system-qtsingleapplication.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 smplayer.spec, 1.26, 1.27 sources, 1.20, 1.21 smplayer-0.8.0-desktop-files.patch, 1.1, NONE smplayer-0.8.1-system-qtsingleapplication.patch, 1.4, NONE smplayer-0.8.3-smtube-system-qtsingleapplication.patch, 1.2, NONE

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/smplayer/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23170

Modified Files:
	.cvsignore smplayer.spec sources 
Added Files:
	smplayer-0.8.5-system-qtsingleapplication.patch 
	smtube-1.7-system-qtsingleapplication.patch 
Removed Files:
	smplayer-0.8.0-desktop-files.patch 
	smplayer-0.8.1-system-qtsingleapplication.patch 
	smplayer-0.8.3-smtube-system-qtsingleapplication.patch 
Log Message:
* Sat May 11 2013 Sérgio Basto <sergio at serjux.com> - 0.8.5-1
- Update smplayer to 0.8.5 and smtube to 1.7
- Fix patches smplayer-0.8.3-smtube-system-qtsingleapplication and
  smplayer-0.8.1-system-qtsingleapplication.patch for 0.8.5 and smtube 1.7


smplayer-0.8.5-system-qtsingleapplication.patch:
 smplayer.pro |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

--- NEW FILE smplayer-0.8.5-system-qtsingleapplication.patch ---
--- ./src/smplayer.pro.qtsingleapplication	2013-05-11 18:48:18.057730407 +0100
+++ ./src/smplayer.pro	2013-05-12 00:39:37.634213140 +0100
@@ -3,6 +3,7 @@ LANGUAGE = C++
 
 CONFIG += qt warn_on
 CONFIG += release
+CONFIG += qtsingleapplication
 #CONFIG += debug
 
 QT += network xml
@@ -263,15 +264,6 @@ FORMS = inputdvddirectory.ui logwindowba
         about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \
         toolbareditor.ui multilineinputdialog.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

smtube-1.7-system-qtsingleapplication.patch:
 smtube.pro |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE smtube-1.7-system-qtsingleapplication.patch ---
--- ./src/smtube.pro.qtsingleapplication	2013-05-03 22:03:39.000000000 +0100
+++ ./src/smtube.pro	2013-05-12 00:47:12.122873411 +0100
@@ -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
 
@@ -76,10 +77,6 @@ TRANSLATIONS = translations/smtube_es.ts
                translations/smtube_ka.ts
 
 
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-HEADERS += qtsingleapplication.h qtlocalpeer.h
-
 unix {
     UI_DIR = .ui
     MOC_DIR = .moc


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-17/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Apr 2013 23:58:56 -0000	1.18
+++ .cvsignore	12 May 2013 01:03:14 -0000	1.19
@@ -1,2 +1,2 @@
-smplayer-0.8.4.tar.bz2
-smtube-1.6.tar.bz2
+smplayer-0.8.5.tar.bz2
+smtube-1.7.tar.bz2


Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-17/smplayer.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- smplayer.spec	7 Apr 2013 23:58:56 -0000	1.26
+++ smplayer.spec	12 May 2013 01:03:14 -0000	1.27
@@ -1,8 +1,8 @@
-%global smtube_ver 1.6
+%global smtube_ver 1.7
 
 Name:           smplayer
-Version:        0.8.4
-Release:        2%{?dist}
+Version:        0.8.5
+Release:        1%{?dist}
 Summary:        A graphical frontend for mplayer
 
 Group:          Applications/Multimedia
@@ -18,8 +18,8 @@
 # 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.1-system-qtsingleapplication.patch
-Patch3:         smplayer-0.8.3-smtube-system-qtsingleapplication.patch
+Patch2:         smplayer-0.8.5-system-qtsingleapplication.patch
+Patch3:         smtube-1.7-system-qtsingleapplication.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
@@ -131,6 +131,11 @@
 %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
 
 %changelog
+* Sat May 11 2013 Sérgio Basto <sergio at serjux.com> - 0.8.5-1
+- Update smplayer to 0.8.5 and smtube to 1.7
+- Fix patches smplayer-0.8.3-smtube-system-qtsingleapplication and
+  smplayer-0.8.1-system-qtsingleapplication.patch for 0.8.5 and smtube 1.7
+
 * Mon Mar 25 2013 Sérgio Basto <sergio at serjux.com> - 0.8.4-2
 - New tag 
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-17/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	7 Apr 2013 23:58:56 -0000	1.20
+++ sources	12 May 2013 01:03:14 -0000	1.21
@@ -1,2 +1,2 @@
-4691b569c4209d7e5a2c1386d9319881  smplayer-0.8.4.tar.bz2
-f496d92d8222bfef04009ddfc36a3101  smtube-1.6.tar.bz2
+deb781ecdc4dd9f0533ccce8f1772865  smplayer-0.8.5.tar.bz2
+d9a954e1b337f0c850dcfc6063255056  smtube-1.7.tar.bz2


--- smplayer-0.8.0-desktop-files.patch DELETED ---


--- smplayer-0.8.1-system-qtsingleapplication.patch DELETED ---


--- smplayer-0.8.3-smtube-system-qtsingleapplication.patch DELETED ---