rpms/smplayer/devel .cvsignore, 1.11, 1.12 smplayer-0.6.9-desktop-files.patch, 1.3, 1.4 smplayer-0.7.0-system-quazip.patch, 1.1, 1.2 smplayer.spec, 1.16, 1.17 sources, 1.11, 1.12

[Sérgio M. Basto]

Author: sergiomb

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

Modified Files:
	.cvsignore smplayer-0.6.9-desktop-files.patch 
	smplayer-0.7.0-system-quazip.patch smplayer.spec sources 
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.



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Feb 2012 03:00:03 -0000	1.11
+++ .cvsignore	24 Mar 2012 02:39:09 -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/devel/smplayer-0.6.9-desktop-files.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smplayer-0.6.9-desktop-files.patch	7 Feb 2012 03:08:07 -0000	1.3
+++ smplayer-0.6.9-desktop-files.patch	24 Mar 2012 02:39:09 -0000	1.4
@@ -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

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(-)

Index: smplayer-0.7.0-system-quazip.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer-0.7.0-system-quazip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smplayer-0.7.0-system-quazip.patch	24 Mar 2012 01:30:31 -0000	1.1
+++ smplayer-0.7.0-system-quazip.patch	24 Mar 2012 02:39:09 -0000	1.2
@@ -34,9 +34,9 @@
  	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.
+--- 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 ) {
@@ -68,9 +68,7 @@
 -	           zip.c
 -
 -	LIBS += -lz
--	
-+	LIBS += -lz -lquazip 
-+ 
++	LIBS += -lz -lquazip
+ 	
  	win32 {
- 		INCLUDEPATH += c:\\development\\zlib-1.2.3
- 		LIBS += -Lc:\\development\\zlib-1.2.3
+ 		INCLUDEPATH += ..\\zlib-1.2.6


Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- smplayer.spec	24 Mar 2012 01:30:31 -0000	1.16
+++ smplayer.spec	24 Mar 2012 02:39:09 -0000	1.17
@@ -8,8 +8,8 @@
 %endif
 
 Name:           smplayer
-Version:        0.7.0
-Release:        3%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        A graphical frontend for mplayer
 
 Group:          Applications/Multimedia
@@ -44,8 +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
+%patch1 -p1 -b .quazip
 
 # correction for wrong-file-end-of-line-encoding
 %{__sed} -i 's/\r//' *.txt
@@ -128,6 +131,12 @@
 %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.


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