Author: dtimms Update of /cvs/free/rpms/dvbcut/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv16289 Modified Files: .cvsignore dvbcut.desktop dvbcut.spec sources Added Files: dvbcut-fix-help-path.patch dvbcut-servicemenu.desktop Removed Files: dvbcut-0.6.0.gcc44-add-include.patch Log Message: update to svn166, cleanups, add desktop file integration dvbcut-fix-help-path.patch: --- NEW FILE dvbcut-fix-help-path.patch --- --- src/dvbcut.cpp.orig 2009-10-26 00:05:33.000000000 +1100 +++ src/dvbcut.cpp 2009-10-26 23:07:56.000000000 +1100 @@ -2456,7 +2456,7 @@ #ifndef __WIN32__ // Unix/Linux: search in the associated share subdirectory if (!QFile::exists(helpFile)) { - helpFile = appDir.dirPath(true) + "/share/help/dvbcut_en.html"; + helpFile = appDir.dirPath(true) + "/share/dvbcut/dvbcut_en.html"; } #endif if (QFile::exists(helpFile)) { --- NEW FILE dvbcut-servicemenu.desktop --- [Desktop Entry] Type=Service X-KDE-Priority=TopLevel X-KDE-ServiceTypes=KonqPopupMenu/Plugin,video/mpg Name=dvbcut mpeg2 tools Comment=dvbcut editor menu Icon=dvbcut Actions=dvbcutOpenMpegStream; Name[en_US]=dvbcut-servicemenu [Desktop Action dvbcutOpenMpegStream] Type=Application Name=Open mpeg stream in dvbcut Exec=dvbcut "%f" Icon=dvbcut Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/dvbcut/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Mar 2009 13:52:13 -0000 1.3 +++ .cvsignore 26 Oct 2009 12:32:29 -0000 1.4 @@ -1 +1 @@ -dvbcut-svn157.tar.bz2 +dvbcut-svn166.tar.bz2 Index: dvbcut.desktop =================================================================== RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dvbcut.desktop 23 Oct 2009 06:16:48 -0000 1.2 +++ dvbcut.desktop 26 Oct 2009 12:32:29 -0000 1.3 @@ -9,4 +9,6 @@ Icon=dvbcut Terminal=false Type=Application +MimeType=video/mpeg; +#nautilus /usr/share/applications, and refresh F5 to see changes to this file. Index: dvbcut.spec =================================================================== RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dvbcut.spec 23 Oct 2009 06:16:48 -0000 1.9 +++ dvbcut.spec 26 Oct 2009 12:32:29 -0000 1.10 @@ -1,4 +1,4 @@ -%define svnrev 157 +%define svnrev 166 %if 0%{?fedora} > 6 %define qt3 qt3 %else @@ -7,7 +7,7 @@ Name: dvbcut Version: 0.6.0 -Release: 9.svn%{svnrev}%{?dist} +Release: 10.svn%{svnrev}%{?dist} Summary: Clip and convert DVB transport streams to MPEG2 program streams Group: Applications/Multimedia @@ -25,7 +25,9 @@ # This desktop file was created by hand. Source4: %{name}.desktop Source5: %{name}-snapshot.sh -Patch0: %{name}-0.6.0.gcc44-add-include.patch +Source6: %{name}-servicemenu.desktop +# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut +Patch0: %{name}-fix-help-path.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf @@ -35,9 +37,11 @@ BuildRequires: libmad-devel BuildRequires: ffmpeg-devel BuildRequires: desktop-file-utils +BuildRequires: kde-filesystem Requires: hicolor-icon-theme # mplayer not actually required, but much better with it. Requires: mplayer +Requires: kde-filesystem %description dvbcut is a Qt application that allows you to select certain parts of an MPEG @@ -51,7 +55,7 @@ %prep %setup -q -n %{name}-svn%{svnrev} -%patch0 -b .gcc44-add-include +%patch0 -b .fix-help-path # Fix QTDIR libs in configure @@ -72,13 +76,14 @@ %configure --with-ffmpeg=%{_prefix} \ --with-ffmpeg-include=%{_includedir}/ffmpeg/ # It does not compile with smp_mflags -make +make %{?_smp_mflags} %install rm -rf %{buildroot} make install \ bindir=%{buildroot}%{_bindir} \ + helpdir=%{buildroot}%{_datadir}/%{name} \ mandir=%{buildroot}%{_mandir} # manual install of icons @@ -96,6 +101,11 @@ desktop-file-install --vendor="" \ --dir %{buildroot}%{_datadir}/applications %{SOURCE4} +#in future: %{_kde4_servicesdir}, but for now +mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ +desktop-file-install \ + --dir=%{buildroot}%{_kde4_datadir}/kde4/services \ + %{SOURCE6} %clean rm -rf %{buildroot} @@ -107,6 +117,8 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +update-desktop-database &> /dev/null || : + %postun touch --no-create %{_datadir}/icons/hicolor || : @@ -114,6 +126,8 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +update-desktop-database &> /dev/null || : + %files %defattr(-,root,root,-) @@ -122,9 +136,20 @@ %{_mandir}/man1/%{name}.1.gz %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/%{name}/dvbcut_*.html +%{_kde4_datadir}/kde4/services/*.desktop %changelog +* Mon Oct 26 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-10.svn166 +- update to svn166 +- drop upstreamed gcc44 patch +- add mpg mimetype to gnome desktop to provide mpeg open with in nautilus +- add kde service menu for mpg files for dolphin +- add help menu to package +- fix help file being placed in /usr/share/help +- allow smp compile + * Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 0.6.0-9.svn157 - Update desktop file according to F-12 FedoraStudio feature @@ -243,4 +268,3 @@ * Thu Nov 08 2007 David Timms <iinet.net.au at dtimms> - 0.5.4-0.1 - initial package for fedora (based on Herbert Graeber packman effort) - Index: sources =================================================================== RCS file: /cvs/free/rpms/dvbcut/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Mar 2009 13:52:13 -0000 1.3 +++ sources 26 Oct 2009 12:32:29 -0000 1.4 @@ -1 +1 @@ -0d397162702d0001e540d57f836662fd dvbcut-svn157.tar.bz2 +9f7f4aaf61cf236422c07aa8d8617126 dvbcut-svn166.tar.bz2 --- dvbcut-0.6.0.gcc44-add-include.patch DELETED ---