12:36 p.m.
Author: svahl
Update of /cvs/free/rpms/smplayer/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26630/F-8
Modified Files:
.cvsignore smplayer.spec sources
Added Files:
smplayer_enqueue_kde3.desktop smplayer_enqueue_kde4.desktop
Log Message:
update for older branches
--- NEW FILE smplayer_enqueue_kde3.desktop ---
[Desktop Entry]
Actions=smplayer_enqueue;
ServiceTypes=audio/ac3,audio/mp4,audio/mpeg,audio/vnd.rn-realaudio,audio/vorbis,audio/x-adpcm,audio/x-matroska,audio/x-mp2,audio/x-mp3,audio/x-ms-wma,audio/x-vorbis,audio/x-wav,video/avi,video/mp4,video/mpeg,video/quicktime,video/vnd.rn-realvideo,video/x-matroska,video/x-ms-asf,video/x-msvideo,video/x-ms-wmv,video/x-ogm,video/x-theora,
[Desktop Action smplayer_enqueue]
Exec=smplayer -add-to-playlist %F
Icon=smplayer
Name=Enqueue in SMPlayer
Name[de]=An Wiedergabeliste von SMPlayer anhängen
Name[es]=Añadir a la lista de reproducción de SMPlayer
Comment=Add file(s) to the SMPlayer playlist
Comment[de]=Datei an Wiedergabeliste von SMPlayer anhängen
Comment[es]=Añade ficheros a la lista de reproducción de SMPlayer
--- NEW FILE smplayer_enqueue_kde4.desktop ---
[Desktop Entry]
Actions=smplayer_enqueue;
Type=Service
Icon=
Name=
X-KDE-ServiceTypes=KonqPopupMenu/Plugin,audio/ac3,audio/mp4,audio/mpeg,audio/vnd.rn-realaudio,audio/vorbis,audio/x-adpcm,audio/x-matroska,audio/x-mp2,audio/x-mp3,audio/x-ms-wma,audio/x-vorbis,audio/x-wav,video/avi,video/mp4,video/mpeg,video/quicktime,video/vnd.rn-realvideo,video/x-matroska,video/x-ms-asf,video/x-msvideo,video/x-ms-wmv,video/x-ogm,video/x-theora,
X-KDE-ExcludeServiceTypes=kdedevice/*
X-KDE-Protocol=!file
[Desktop Action smplayer_enqueue]
Exec=smplayer -add-to-playlist %F
Icon=smplayer
Name=Enqueue in SMPlayer
Name[de]=An Wiedergabeliste von SMPlayer anhängen
Name[es]=Añadir a la lista de reproducción de SMPlayer
Comment=Add file(s) to the SMPlayer playlist
Comment[de]=Datei an Wiedergabeliste von SMPlayer anhängen
Comment[es]=Añade ficheros a la lista de reproducción de SMPlayer
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Jul 2008 19:45:39 -0000 1.2
+++ .cvsignore 3 Oct 2008 12:36:28 -0000 1.3
@@ -1 +1 @@
-smplayer-0.6.1.tar.bz2
+smplayer-0.6.3.tar.bz2
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-8/smplayer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smplayer.spec 30 Jul 2008 05:21:24 -0000 1.2
+++ smplayer.spec 3 Oct 2008 12:36:28 -0000 1.3
@@ -8,14 +8,20 @@
%endif
Name: smplayer
-Version: 0.6.1
-Release: 4%{?dist}
+Version: 0.6.3
+Release: 1%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
License: GPLv2+
URL: http://smplayer.sourceforge.net/linux/
-Source0: http://downloads.sourceforge.net/smplayer/%{name}-%{version}.tar.bz2
+Source0: http://download.berlios.de/smplayer/smplayer-%{version}.tar.bz2
+# Add a servicemenu to enqeue files in smplayer's playlist.
+# The first one is for KDE4, the second one for KDE3.
+# see also:
+#
https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052...
+Source1: smplayer_enqueue_kde4.desktop
+Source2: smplayer_enqueue_kde3.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -40,7 +46,6 @@
iconv -f Latin1 -t UTF-8 -o Changelog.utf8 Changelog
mv Changelog.utf8 Changelog
-
# use lrelease from qt4-devel
sed -i 's|LRELEASE=lrelease|LRELEASE=%{_qt4_lrelease}|' Makefile
@@ -50,6 +55,9 @@
# use %{?_smp_mflags}
sed -i '/cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make/s!$!
%{?_smp_mflags}!' Makefile
+# don't show smplayer_enqueue.desktop in KDE and use servicemenus instead
+echo "NotShowIn=KDE;" >> smplayer_enqueue.desktop
+
%build
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
@@ -62,9 +70,20 @@
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-# drop smplayer_enqueue.desktop until it's working
-#
https://sourceforge.net/tracker/index.php?func=detail&aid=2010348&...
-rm -f %{buildroot}%{_datadir}/applications/smplayer_enqueue.desktop
+
+desktop-file-install --delete-original \
+ --vendor "rpmfusion" \
+ --dir %{buildroot}%{_datadir}/applications/ \
+ %{buildroot}%{_datadir}/applications/%{name}_enqueue.desktop
+
+# Add servicemenus dependend on the version of KDE:
+#
https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&...
+%if 0%{?fedora} >= 9
+ install -Dpm 0644 %{SOURCE1}
%{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
+%else
+ install -Dpm 0644 %{SOURCE2}
%{buildroot}%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
+%endif
+
%clean
rm -rf %{buildroot}
@@ -85,16 +104,30 @@
%files
%defattr(-,root,root,-)
-#%doc Changelog Copying.txt Readme.txt Release_notes.txt
%{_docdir}/%{name}-%{version}/
%{_bindir}/smplayer
-%{_datadir}/applications/rpmfusion-smplayer.desktop
-#%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
+%{_datadir}/applications/rpmfusion-smplayer*.desktop
%{_datadir}/icons/hicolor/*/apps/smplayer.png
%{_datadir}/smplayer/
%{_mandir}/man1/smplayer.1.gz
+%if 0%{?fedora} >= 9
+ %dir %{_datadir}/kde4/services/ServiceMenus/
+ %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
+%else
+ %dir %{_datadir}/apps/konqueror/
+ %dir %{_datadir}/apps/konqueror/servicemenus/
+ %{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
+%endif
+
%changelog
+* Mon Sep 29 2008 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.3-1
+- new upstream version: 0.6.3
+
+* Fri Aug 15 2008 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.2-1
+- new upstream version: 0.6.2
+- add servicemenus depending on the KDE version
+
* Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.6.1-4
- rebuild for buildsys cflags issue
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Jul 2008 19:45:39 -0000 1.2
+++ sources 3 Oct 2008 12:36:28 -0000 1.3
@@ -1 +1 @@
-af89719da92b5aa6760f2d73b0762ec8 smplayer-0.6.1.tar.bz2
+dc1d482557cfda6d59534e9623a9fb16 smplayer-0.6.3.tar.bz2