rpms/smplayer/devel smplayer-0.7.0-system-quazip.patch, NONE, 1.1 smplayer.spec, 1.15, 1.16

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/smplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13471

Modified Files:
	smplayer.spec 
Added Files:
	smplayer-0.7.0-system-quazip.patch 
Log Message:
* Sat Mar 24 2012 Sérgio Basto <sergio at serjux.com> - 0.7.0-3
- Add a patch to remove bundled quazip shlibs and Requires kde-filesystem, bug rfbz #1164
- Removed tag BuildRoot.


smplayer-0.7.0-system-quazip.patch:
 smplayer-0.6.9/src/findsubtitles/findsubtitles.pro |   20 +----------------
 smplayer-0.7.0/src/smplayer.pro                    |   24 ++++-----------------
 2 files changed, 7 insertions(+), 37 deletions(-)

--- NEW FILE smplayer-0.7.0-system-quazip.patch ---
diff -urP smplayer-0.6.9.org/src/findsubtitles/findsubtitles.pro smplayer-0.6.9/src/findsubtitles/findsubtitles.pro
--- smplayer-0.6.9.org/src/findsubtitles/findsubtitles.pro	2009-01-01 15:34:51.000000000 -0700
+++ smplayer-0.6.9/src/findsubtitles/findsubtitles.pro	2010-04-26 03:51:13.821648677 -0600
@@ -28,30 +28,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.7.0/src/smplayer.pro.orig	2012-01-22 09:45:20.000000000 +0000
+++ smplayer-0.7.0/src/smplayer.pro	2012-03-24 00:55:09.670097366 +0000
@@ -256,32 +256,18 @@ TRANSLATIONS = translations/smplayer_es.
                translations/smplayer_da.ts translations/smplayer_hr.ts
 
 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
 	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
+	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 += c:\\development\\zlib-1.2.3
 		LIBS += -Lc:\\development\\zlib-1.2.3


Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smplayer.spec	2 Mar 2012 22:15:38 -0000	1.15
+++ smplayer.spec	24 Mar 2012 01:30:31 -0000	1.16
@@ -9,7 +9,7 @@
 
 Name:           smplayer
 Version:        0.7.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical frontend for mplayer
 
 Group:          Applications/Multimedia
@@ -25,12 +25,14 @@
 # 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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         smplayer-0.7.0-system-quazip.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
+BuildRequires:  quazip-devel
 # smplayer without mplayer is quite useless
 Requires:       mplayer
+Requires:       kde-filesystem
 
 %description
 smplayer intends to be a complete front-end for Mplayer, from basic features
@@ -43,6 +45,7 @@
 %prep
 %setup -qn %{name}-%{version}
 %patch0 -p0 -b .desktop-files
+%patch1 -p1
 
 # correction for wrong-file-end-of-line-encoding
 %{__sed} -i 's/\r//' *.txt
@@ -125,6 +128,10 @@
 %endif
 
 %changelog
+* Sat Mar 24 2012 Sérgio Basto <sergio at serjux.com> - 0.7.0-3
+- Add a patch to remove bundled quazip shlibs and Requires kde-filesystem, bug rfbz #1164
+- Removed tag BuildRoot.
+
 * Fri Mar 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.7.0-2
 - Rebuilt for c++ ABI breakage