rpms/smplayer/F-15 smplayer-0.7.0-system-quazip.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 smplayer-0.6.9-desktop-files.patch, 1.2, 1.3 smplayer.spec, 1.14, 1.15 sources, 1.11, 1.12

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/smplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10456

Modified Files:
	.cvsignore smplayer-0.6.9-desktop-files.patch smplayer.spec 
	sources 
Added Files:
	smplayer-0.7.0-system-quazip.patch 
Log Message:
* Sat Mar 24 2012 Sérgio Basto <sergio at serjux.com> - 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." 
- Remove some bundle sources.
- Small fixes in patches to fit on 0.7.1.

* 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.1/src/smplayer.pro                    |   22 +++------------------
 2 files changed, 6 insertions(+), 36 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.1/src/smplayer.pro.orig	2012-02-09 11:07:02.000000000 +0000
+++ smplayer-0.7.1/src/smplayer.pro	2012-03-24 01:57:08.950048887 +0000
@@ -256,31 +256,17 @@ 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 += ..\\zlib-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-15/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Feb 2012 03:43:09 -0000	1.11
+++ .cvsignore	24 Mar 2012 03:21:15 -0000	1.12
@@ -1 +1 @@
-smplayer-0.7.0.tar.bz2
+smplayer-0.7.1.tar.bz2

smplayer-0.6.9-desktop-files.patch:
 smplayer.desktop         |    2 +-
 smplayer_enqueue.desktop |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: smplayer-0.6.9-desktop-files.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-15/smplayer-0.6.9-desktop-files.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smplayer-0.6.9-desktop-files.patch	7 Feb 2012 03:43:09 -0000	1.2
+++ smplayer-0.6.9-desktop-files.patch	24 Mar 2012 03:21:15 -0000	1.3
@@ -15,7 +15,7 @@
 +++ ./smplayer_enqueue.desktop	2010-05-24 17:12:31.152634138 +0200
 @@ -1,6 +1,6 @@
  [Desktop Entry]
- Categories=Qt;AudioVideo;Player;Video;
+ Categories=Qt;KDE;AudioVideo;Player;Video;
 -Exec=smplayer -add-to-playlist %U
 +Exec=smplayer -add-to-playlist %F
  Icon=smplayer


Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-15/smplayer.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smplayer.spec	7 Feb 2012 03:43:09 -0000	1.14
+++ smplayer.spec	24 Mar 2012 03:21:15 -0000	1.15
@@ -8,7 +8,7 @@
 %endif
 
 Name:           smplayer
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        A graphical frontend for mplayer
 
@@ -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
@@ -42,7 +44,11 @@
 
 %prep
 %setup -qn %{name}-%{version}
+#remove some bundle sources 
+rm -rf zlib-1.2.6
+rm -rf src/findsubtitles/quazip
 %patch0 -p0 -b .desktop-files
+%patch1 -p1 -b .quazip
 
 # correction for wrong-file-end-of-line-encoding
 %{__sed} -i 's/\r//' *.txt
@@ -125,6 +131,19 @@
 %endif
 
 %changelog
+* Sat Mar 24 2012 Sérgio Basto <sergio at serjux.com> - 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." 
+- Remove some bundle sources.
+- Small fixes in patches to fit on 0.7.1.
+
+* 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
+
 * Tue Feb 7 2012 Sérgio Basto <sergio at serjux.com> - 0.7.0-1
 - new upstream version: 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-15/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Feb 2012 03:43:09 -0000	1.11
+++ sources	24 Mar 2012 03:21:15 -0000	1.12
@@ -1 +1 @@
-e39ba5b54e6218d411ecd296002d77bb  smplayer-0.7.0.tar.bz2
+e50046399ee918bb7b57e98971425c95  smplayer-0.7.1.tar.bz2