avatar
mur has added b20be15f22
Fix command line argument convertation
... ... --- a/create_rpm.py
... ... +++ b/create_rpm.py
... ... @@ -5,7 +5,7 @@ import tarfile
5 5
import shutil
6 6
import subprocess
7 7
8
version = '1.6'
8
version = '1.6.11'
9 9
name = 'rosa-media-player'
10 10
11 11
files = ['rosa-media-player']
view file @ b20be15f22
... ... --- a/rosa-media-player.spec
... ... +++ b/rosa-media-player.spec
... ... @@ -1,68 +1,42 @@
1
%define		midi_support	1
1
%bcond_without midi
2 2
3 3
Summary:	Multimedia player based on mplayer technology
4 4
Name:		rosa-media-player
5
Version:	1.6.10
6
Release:	%mkrel 1
5
Version:	1.6.11
6
Release:	1
7 7
License:	GPLv2+
8 8
Group:		Video
9
Url:		https://abf.rosalinux.ru/uxteam/ROSA_Media_Player
10
Source:		%{name}-%{version}.tar.gz
11
BuildRequires:	qt4-devel	>= 4.2.0
12
BuildRequires:	qt4-linguist	>= 4.2.0
13
%if %midi_support
9
Url:		http://www.rosalinux.com
10
Source0:	%{name}-%{version}.tar.gz
11
BuildRequires:	qt4-linguist
12
BuildRequires:	qt4-devel
13
%if %{with midi}
14 14
BuildRequires:	wildmidi-devel
15 15
%endif
16
BuildRequires:	qjson-devel
17
Requires:	mplayer		>= 1.0-1.rc1
16
BuildRequires:	pkgconfig(QJson)
18 17
Requires:	mencoder
18
Requires:	mplayer >= 1.0-1.rc1
19 19
Requires:	ffmpeg
20 20
Requires:	xdg-utils
21
%if %midi_support
21
%if %{with midi}
22 22
Requires:	timidity-patch-gravis
23
Requires:	%{_lib}wildmidi1
24 23
%endif
25
Requires:	qjson
26 24
Requires:	wget
27 25
28
BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
29
30 26
%description
31 27
Multimedia player that supports most of audio and video formats.
32 28
33
%prep
34
%setup -qn %{name}
35
36
%build
37
%setup_compile_flags
38
./get_romp_version.sh %{version} %{release}
39
%if %midi_support
40
%make PREFIX=%{_prefix} QMAKE=%{qt4bin}/qmake LRELEASE=%{qt4bin}/lrelease
41
%else
42
%make PREFIX=%{_prefix} QMAKE=%{qt4bin}/qmake LRELEASE=%{qt4bin}/lrelease no-midi-support
43
%endif
44
45
%install
46
%makeinstall_std PREFIX=%{_prefix}
47
48
# remove wrongly put docs
49
rm -rf %{buildroot}%{_datadir}/doc
50
51
52 29
%files
53 30
%doc *.txt docs/*
54 31
%dir %{_datadir}/%{name}
55 32
%dir %{_datadir}/%{name}/shortcuts
56 33
%dir %{_datadir}/%{name}/translations
57
58 34
%attr(755,root,root) %{_bindir}/%{name}
59
60 35
%{_datadir}/%{name}/*.conf
61
%{_iconsdir}/hicolor/*/apps/rosamp.png
62 36
%{_datadir}/applications/*.desktop
63 37
%{_datadir}/%{name}/shortcuts/*
64 38
%{_datadir}/apps/solid/actions/
65
39
%{_iconsdir}/hicolor/*/apps/rosamp.png
66 40
%lang(ar_SY) %{_datadir}/%{name}/translations/rosamp_ar_SY.qm
67 41
%lang(en) %{_datadir}/%{name}/translations/rosamp_en.qm
68 42
%lang(cs) %{_datadir}/%{name}/translations/rosamp_cs.qm
... ... @@ -91,25 +65,23 @@ rm -rf %{buildroot}%{_datadir}/doc
65 65
%lang(zh_CN) %{_datadir}/%{name}/translations/rosamp_zh_CN.qm
66 66
%lang(zh_TW) %{_datadir}/%{name}/translations/rosamp_zh_TW.qm
67 67
68
#----------------------------------------------------------------------------
68 69
69
%changelog
70
* Mon Dec 19 2011 Evgeniy Auginev <eauginev@mandriva.org> 0.952-4mdv2012.0
71
+ Revision: 743747
72
- audio files playing interface error fixed
70
%prep
71
%setup -qn %{name}
73 72
74
* Fri Dec 16 2011 Evgeniy Auginev <eauginev@mandriva.org> 0.952-2
75
+ Revision: 743050
76
-copy parameter added on split video function
73
%build
74
%setup_compile_flags
75
./get_romp_version.sh %{version} %{release}
76
%if %{with midi}
77
%make PREFIX=%{_prefix} QMAKE=%{qt4bin}/qmake LRELEASE=%{qt4bin}/lrelease
78
%else
79
%make PREFIX=%{_prefix} QMAKE=%{qt4bin}/qmake LRELEASE=%{qt4bin}/lrelease no-midi-support
80
%endif
77 81
78
* Fri Dec 09 2011 Evgeniy Auginev <eauginev@mandriva.org> 0.952-1
79
+ Revision: 739438
80
- Playlist item hints added; free-space calculating algorithm changed for split video function; one running instance option fixed
82
%install
83
%makeinstall_std PREFIX=%{_prefix}
81 84
82
* Mon Nov 28 2011 Evgeniy Auginev <eauginev@mandriva.org> 0.951-3
83
+ Revision: 734874
84
- fix archive name
85
- change version number
85
# remove wrongly put docs
86
rm -rf %{buildroot}%{_datadir}/doc
86 87
87
* Mon Nov 28 2011 Alex Burmashev <burmashev@mandriva.org> 0.95-3
88
+ Revision: 734825
89
- import rosa-media-player
view file @ b20be15f22
... ... --- a/rosa-media-player/src/romp_version.h
... ... +++ b/rosa-media-player/src/romp_version.h
... ... @@ -1 +1 @@
1
#define ROMP_VERSION "1.6.10" 
1
#define ROMP_VERSION "1.6.11" 
view file @ b20be15f22
... ... --- a/rosa-media-player/src/smplayer.cpp
... ... +++ b/rosa-media-player/src/smplayer.cpp
... ... @@ -27,6 +27,7 @@
27 27
#include "clhelp.h"
28 28
29 29
#include <QDir>
30
#include <QUrl>
30 31
#include <QApplication>
31 32
32 33
#include <stdio.h>
... ... @@ -268,6 +269,12 @@ SMPlayer::ExitCode SMPlayer::processArgs(QStringList args)
269 269
        else
270 270
        {
271 271
            // File
272
#if QT_VERSION >= 0x040600
273
            QUrl fUrl = QUrl::fromUserInput(argument);
274
            if (fUrl.isValid() && fUrl.scheme().toLower() == "file") {
275
                argument = fUrl.toLocalFile();
276
            }
277
#endif
272 278
            if (QFile::exists( argument ))
273 279
            {
274 280
                argument = QFileInfo(argument).absoluteFilePath();

Comments