rpms/smplayer/devel .cvsignore, 1.28, 1.29 smplayer-14.9.0.6966-system-qtsingleapplication.patch, 1.1, 1.2 smplayer.spec, 1.44, 1.45 smtube-15.5.10-system-qtsingleapplication.patch, 1.1, 1.2 sources, 1.30, 1.31 smplayer-14.9.0-get_svn_revision.patch, 1.1, NONE

Sérgio M. Basto sergiomb at rpmfusion.org
Fri Oct 2 23:21:16 CEST 2015 

Author: sergiomb

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

Modified Files:
	.cvsignore 
	smplayer-14.9.0.6966-system-qtsingleapplication.patch 
	smplayer.spec smtube-15.5.10-system-qtsingleapplication.patch 
	sources 
Removed Files:
	smplayer-14.9.0-get_svn_revision.patch 
Log Message:
* Fri Oct 02 2015 Sérgio Basto <sergio at serjux.com> - 15.9.0-1
- Update smplayer to 15.9.0 and smtube to 15.9.0 .



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	17 Jun 2015 01:43:00 -0000	1.28
+++ .cvsignore	2 Oct 2015 21:21:16 -0000	1.29
@@ -1,2 +1,2 @@
-smplayer-14.9.0.6994.tar.bz2
-smtube-15.5.17.tar.bz2
+smplayer-15.9.0.tar.bz2
+smtube-15.9.0.tar.bz2

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

Index: smplayer-14.9.0.6966-system-qtsingleapplication.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer-14.9.0.6966-system-qtsingleapplication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smplayer-14.9.0.6966-system-qtsingleapplication.patch	6 Jun 2015 21:26:41 -0000	1.1
+++ smplayer-14.9.0.6966-system-qtsingleapplication.patch	2 Oct 2015 21:21:16 -0000	1.2
@@ -1,5 +1,5 @@
---- ./src/smplayer.pro.orig	2015-04-18 03:11:32.000000000 +0100
-+++ ./src/smplayer.pro	2015-06-06 19:37:48.769799609 +0100
+--- ./src/smplayer.pro.orig	2015-08-03 22:54:00.000000000 +0100
++++ ./src/smplayer.pro	2015-10-02 22:07:32.679161412 +0100
 @@ -3,6 +3,7 @@ LANGUAGE = C++
  
  CONFIG += qt warn_on
@@ -8,9 +8,9 @@
  #CONFIG += debug
  
  QT += network xml
-@@ -283,14 +284,6 @@ FORMS = inputdvddirectory.ui logwindowba
-         about.ui inputmplayerversion.ui errordialog.ui timedialog.ui stereo3ddialog.ui \
-         toolbareditor.ui multilineinputdialog.ui
+@@ -309,14 +310,6 @@ contains( DEFINES, MPLAYER_SUPPORT ) {
+ 	SOURCES += mplayerprocess.cpp inforeadermplayer.cpp
+ }
  
 -# qtsingleapplication
 -contains( DEFINES, SINGLE_INSTANCE ) {


Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- smplayer.spec	17 Jun 2015 01:40:21 -0000	1.44
+++ smplayer.spec	2 Oct 2015 21:21:16 -0000	1.45
@@ -1,7 +1,7 @@
-%global smtube_ver 15.5.17
+%global smtube_ver 15.9.0
 
 Name:           smplayer
-Version:        14.9.0.6994
+Version:        15.9.0
 Release:        1%{?dist}
 Summary:        A graphical frontend for mplayer
 
@@ -13,7 +13,7 @@
 # see also: 
 # https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&group_id=185512
 Source1:        smplayer_enqueue_kde4.desktop
-Source3:        http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
+Source3:        http://downloads.sourceforge.net/smtube/smtube-%{smtube_ver}.tar.bz2
 # Fix regression in Thunar (TODO: re-check in upcoming versions!)
 # https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
 Patch0:         smplayer-0.8.3-desktop-files.patch
@@ -60,7 +60,7 @@
 mv Changelog.utf8 Changelog
 
 # fix path of docs
-sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile
+sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 
 # use %{?_smp_mflags}
 sed -i '/cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make/s!$! %{?_smp_mflags}!' Makefile
@@ -73,7 +73,7 @@
 
 pushd smtube-%{smtube_ver}
 sed -i 's|/usr/local|%{_prefix}|' Makefile
-sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
+sed -i 's|doc/smtube|doc/%{name}/smtube|' Makefile
 sed -i 's|smtube/translations|smplayer/translations|' Makefile
 make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt4
 popd
@@ -117,7 +117,6 @@
 update-desktop-database &> /dev/null || :
 
 %files
-%{_docdir}/%{name}-%{version}/
 %{_bindir}/smplayer
 %{_bindir}/smtube
 %{_datadir}/applications/rpmfusion-smplayer*.desktop
@@ -126,11 +125,19 @@
 %{_datadir}/icons/hicolor/*/apps/smplayer.svg
 %{_datadir}/icons/hicolor/*/apps/smtube.png
 %{_datadir}/smplayer/
-%{_mandir}/man1/smplayer.1.gz
 %dir %{_datadir}/kde4/services/ServiceMenus/
 %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
+%{_mandir}/man1/smplayer.1.gz
+%{_docdir}/%{name}/
 
 %changelog
+* Fri Oct 02 2015 Sérgio Basto <sergio at serjux.com> - 15.9.0-1
+- Update smplayer to 15.9.0 and smtube to 15.9.0 .
+
+* Thu Aug 20 2015 Sérgio Basto <sergio at serjux.com> - 14.9.0.6994-2
+- Update smtube to 15.8.0 .
+- Removed version of package from _docdir directory (following the guidelines).
+
 * Wed Jun 17 2015 Sérgio Basto <sergio at serjux.com> - 14.9.0.6994-1
 - Update to 4.9.0.6994 .
 - Drop smplayer-14.9.0-get_svn_revision.patch .

smtube-15.5.10-system-qtsingleapplication.patch:
 smtube.pro |    2 ++
 1 file changed, 2 insertions(+)

Index: smtube-15.5.10-system-qtsingleapplication.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smtube-15.5.10-system-qtsingleapplication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smtube-15.5.10-system-qtsingleapplication.patch	6 Jun 2015 21:26:41 -0000	1.1
+++ smtube-15.5.10-system-qtsingleapplication.patch	2 Oct 2015 21:21:16 -0000	1.2
@@ -1,5 +1,5 @@
---- ./src/smtube.pro.orig	2015-06-06 19:41:57.132618395 +0100
-+++ ./src/smtube.pro	2015-06-06 19:43:23.309596085 +0100
+--- ./src/smtube.pro.orig	2015-08-19 23:20:59.000000000 +0100
++++ ./src/smtube.pro	2015-08-20 20:36:29.130599873 +0100
 @@ -1,12 +1,14 @@
  
  TEMPLATE = app
@@ -13,5 +13,5 @@
  DEFINES += YT_USE_SCRIPT
 +DEFINES += USE_SINGLE_APPLICATION
  
- isEqual(QT_MAJOR_VERSION, 5) {
- 	QT += webkitwidgets widgets gui
+ DEFINES += D_PLAYERS
+ 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	17 Jun 2015 01:43:01 -0000	1.30
+++ sources	2 Oct 2015 21:21:16 -0000	1.31
@@ -1,2 +1,2 @@
-666a589b1fc3480a29e87f0ee7efd511  smplayer-14.9.0.6994.tar.bz2
-577ebdf5fbcd3d17959294e688c124b4  smtube-15.5.17.tar.bz2
+6ab6f96030df63b79f3a28fb3f99107d  smplayer-15.9.0.tar.bz2
+9717ae650d1bbb47d4cd94b942306695  smtube-15.9.0.tar.bz2


--- smplayer-14.9.0-get_svn_revision.patch DELETED ---

More information about the rpmfusion-commits mailing list