rpms/smplayer/devel smplayer-0.8.1-system-qtsingleapplication.patch, NONE, 1.1 smplayer-0.8.1-system-quazip.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 smplayer.spec, 1.20, 1.21 sources, 1.13, 1.14 smplayer-0.8.0-system-qtsingleapplication.patch, 1.1, NONE

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/smplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6436

Modified Files:
	.cvsignore smplayer.spec sources 
Added Files:
	smplayer-0.8.1-system-qtsingleapplication.patch 
	smplayer-0.8.1-system-quazip.patch 
Removed Files:
	smplayer-0.8.0-system-qtsingleapplication.patch 
Log Message:
* Thu Sep 20 2012 Sérgio Basto <sergio at serjux.com> - 0.8.1-1
- New upsteam release.
- rfbz #2113, all done by Nucleo.


smplayer-0.8.1-system-qtsingleapplication.patch:
 smtube-1.2.1/src/smtube.pro |    9 +++------
 src/smplayer.pro            |   10 +---------
 2 files changed, 4 insertions(+), 15 deletions(-)

--- NEW FILE smplayer-0.8.1-system-qtsingleapplication.patch ---
--- smplayer-0.8.1/smtube-1.2.1/src/smtube.pro	2012-05-09 01:12:42.000000000 +0300
+++ smplayer-0.8.1/smtube-1.2.1/src/smtube.pro	2012-09-20 13:11:52.937317532 +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
 
@@ -63,10 +64,6 @@
                translations/smtube_hu.ts \
                translations/smtube_pl.ts
 
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-HEADERS += qtsingleapplication.h qtlocalpeer.h
-
 unix {
     UI_DIR = .ui
     MOC_DIR = .moc
--- smplayer-0.8.1/src/smplayer.pro	2012-06-01 18:37:36.000000000 +0300
+++ smplayer-0.8.1/src/smplayer.pro	2012-09-20 13:11:52.937317532 +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.1-system-quazip.patch:
 findsubtitles/findsubtitles.pro |   20 ++------------------
 smplayer.pro                    |   22 ++++------------------
 2 files changed, 6 insertions(+), 36 deletions(-)

--- NEW FILE smplayer-0.8.1-system-quazip.patch ---
--- smplayer-0.8.1/src/findsubtitles/findsubtitles.pro	2012-03-31 15:46:16.000000000 +0300
+++ smplayer-0.8.1/src/findsubtitles/findsubtitles.pro	2012-09-20 13:06:27.086599698 +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.1/src/smplayer.pro	2012-06-01 18:37:36.000000000 +0300
+++ smplayer-0.8.1/src/smplayer.pro	2012-09-20 13:06:27.087599689 +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


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	28 Apr 2012 01:26:44 -0000	1.13
+++ .cvsignore	20 Sep 2012 21:09:07 -0000	1.14
@@ -1,2 +1,2 @@
-smplayer-0.8.0.tar.bz2
-smtube-1.1.tar.bz2
+smplayer-0.8.1.tar.bz2
+smtube-1.2.1.tar.bz2


Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- smplayer.spec	6 May 2012 21:08:09 -0000	1.20
+++ smplayer.spec	20 Sep 2012 21:09:07 -0000	1.21
@@ -1,8 +1,8 @@
-%global smtube_ver 1.1
+%global smtube_ver 1.2.1
 
 Name:           smplayer
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        A graphical frontend for mplayer
 
 Group:          Applications/Multimedia
@@ -17,8 +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.0-desktop-files.patch
-Patch1:         smplayer-0.8.0-system-quazip.patch
-Patch2:         smplayer-0.8.0-system-qtsingleapplication.patch
+Patch1:         smplayer-0.8.1-system-quazip.patch
+Patch2:         smplayer-0.8.1-system-qtsingleapplication.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
@@ -27,6 +27,7 @@
 # smplayer without mplayer is quite useless
 Requires:       mplayer
 Requires:       kde-filesystem
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
 smplayer intends to be a complete front-end for Mplayer, from basic features
@@ -40,9 +41,10 @@
 %setup -qn %{name}-%{version}
 %setup -a3 -qn %{name}-%{version}
 #remove some bundle sources 
-rm -rf zlib-1.2.6
+rm -rf zlib
 rm -rf src/findsubtitles/quazip
 rm -rf src/qtsingleapplication/
+rm -rf smtube-%{smtube_ver}/src/qtsingleapplication/
 
 %patch0 -p0 -b .desktop-files
 %patch1 -p1 -b .quazip
@@ -54,9 +56,6 @@
 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=%{_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
 
@@ -67,15 +66,13 @@
 echo "NotShowIn=KDE;" >> smplayer_enqueue.desktop
 
 %build
-make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
+make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt4
 
 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}
+make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt4
 popd
 
 
@@ -130,6 +127,10 @@
 %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
 
 %changelog
+* Thu Sep 20 2012 Sérgio Basto <sergio at serjux.com> - 0.8.1-1
+- New upsteam release.
+- rfbz #2113, all done by Nucleo.
+
 * Sat Apr 28 2012 Sérgio Basto <sergio at serjux.com> - 0.8.0-2
 - fix smtube translations.
 - drop support for Fedora < 9 and EPEL 5, since we need kde4.


Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Apr 2012 01:26:44 -0000	1.13
+++ sources	20 Sep 2012 21:09:07 -0000	1.14
@@ -1,2 +1,2 @@
-8f7d3a9c116e956c68976d0e5dbb83dd  smplayer-0.8.0.tar.bz2
-e5018fcd9ebdc08658136476ba4843d2  smtube-1.1.tar.bz2
+39556a6113afcd9ceee071a8f85477dc  smplayer-0.8.1.tar.bz2
+04eab6c1034670bf4269eb1a3eb110ef  smtube-1.2.1.tar.bz2


--- smplayer-0.8.0-system-qtsingleapplication.patch DELETED ---