Author: dtimms Update of /cvs/free/rpms/dvbcut/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20718 Modified Files: .cvsignore dvbcut.spec sources Added Files: dvbcut-svn176-desktop-additions.patch dvbcut-svn176-fix-help-install-path.patch dvbcut-svn176-fix-make-install.patch Removed Files: dvbcut.desktop dvbcut.logo.16x16.png dvbcut.logo.24x24.png dvbcut.logo.48x48.png Log Message: update to 0.6.1 release post svn176 includes upstream enhancement to work with certain transport streams delete upstreamed patches update makefile patches delete desktop file, patch included desktop file instead. dvbcut-svn176-desktop-additions.patch: dvbcut.desktop.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- NEW FILE dvbcut-svn176-desktop-additions.patch --- --- dvbcut.desktop.in.orig 2011-04-25 11:27:29.000000000 +1000 +++ dvbcut.desktop.in 2011-04-26 11:37:42.022156749 +1000 @@ -2,13 +2,14 @@ Type=Application Version=1.0 Name=DVBcut -GenericName=DVB Cutting Program +GenericName=DVB Cutting Program for MPEG Transport Stream files NoDisplay=false -Comment=Cut DVB streams +Comment=Trim and cut video MPEG2 transport streams into multiple export formats Icon=@prefix(a)/share/dvbcut/icons/dvbcut.svg TryExec=@prefix@/bin/dvbcut Exec=@prefix@/bin/dvbcut %F Terminal=false -MimeType=application/x-dvbcut; -Categories=AudioVideo;AudioVideoEditing;Qt; +MimeType=application/x-dvbcut;video/mpeg; +Categories=AudioVideo;Player;AudioVideoEditing;Qt; StartupWMClass=Dvbcut +#nautilus /usr/share/applications, and refresh F5 to see changes to this file. dvbcut-svn176-fix-help-install-path.patch: Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE dvbcut-svn176-fix-help-install-path.patch --- --- src/Makefile.in.orig 2011-04-25 11:27:24.000000000 +1000 +++ src/Makefile.in 2011-04-26 10:35:06.439380620 +1000 @@ -29,7 +29,7 @@ datarootdir = @datarootdir@ mandir = @mandir@ man1dir = $(mandir)/man1 -helpdir = $(prefix)/share/help +helpdir = $(datadir)/dvbcut installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(helpdir) dvbcut-svn176-fix-make-install.patch: makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) --- NEW FILE dvbcut-svn176-fix-make-install.patch --- --- makefile.in.orig 2011-04-25 11:27:29.000000000 +1000 +++ makefile.in 2011-04-26 09:56:06.506983163 +1000 @@ -30,9 +30,9 @@ pkgdatadir = $(datarootdir)/dvbcut installdirs = $(DESTDIR)$(man1dir) \ - $(DESTDIR)$(pkgdatadir)/icons \ - $(DESTDIR)/usr/share/applications \ - $(DESTDIR)/usr/share/mime/packages + $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps \ + $(DESTDIR)$(datadir)/applications \ + $(DESTDIR)$(datadir)/mime/packages INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -47,10 +47,9 @@ dep-local: install-local: $(installdirs) dvbcut.1 dvbcut.desktop dvbcut.xml $(INSTALL_DATA) dvbcut.1 $(DESTDIR)$(man1dir)/dvbcut.1 - $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)/usr/share/applications - $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(pkgdatadir)/icons - $(INSTALL_DATA) dvbcut.xml $(DESTDIR)/usr/share/mime/packages - -update-mime-database $(DESTDIR)/usr/share/mime + $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)$(datadir)/applications + $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps + $(INSTALL_DATA) dvbcut.xml $(DESTDIR)$(datadir)/mime/packages $(installdirs): $(SHELL) $(top_srcdir)/mkinstalldirs $@ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/dvbcut/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Oct 2009 12:32:29 -0000 1.4 +++ .cvsignore 26 Apr 2011 02:07:33 -0000 1.5 @@ -1 +1 @@ -dvbcut-svn166.tar.bz2 +dvbcut-svn176.tar.bz2 Index: dvbcut.spec =================================================================== RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dvbcut.spec 26 Oct 2009 12:36:03 -0000 1.11 +++ dvbcut.spec 26 Apr 2011 02:07:33 -0000 1.12 @@ -1,4 +1,4 @@ -%define svnrev 166 +%define svnrev 176 %if 0%{?fedora} > 6 %define qt3 qt3 %else @@ -6,28 +6,28 @@ %endif Name: dvbcut -Version: 0.6.0 -Release: 10.svn%{svnrev}%{?dist} +Version: 0.6.1 +Release: 1.svn%{svnrev}%{?dist} Summary: Clip and convert DVB transport streams to MPEG2 program streams Group: Applications/Multimedia License: GPLv2+ and LGPLv2 URL: http://dvbcut.sourceforge.net/ # fixes were committed to svn since release, so using svn checkout for latest fixes: +# original upstream archive location: #Source0: http://downloads.sourceforge.net/dvbcut/dvbcut_%{version}.tar.bz2 +# current upstream release location: +#Source0: http://www.mr511.de/dvbcut/dvbcut-0.6.1.tar.gz # use sh dvbcut-snapshot.sh to create the archive Source0: %{name}-svn%{svnrev}.tar.bz2 -# Since no icons have been developed by the project, created icons using the -# weblogo on the home page. Scaled and text pixel edited using gimp. -Source1: %{name}.logo.16x16.png -Source2: %{name}.logo.24x24.png -Source3: %{name}.logo.48x48.png # This desktop file was created by hand. -Source4: %{name}.desktop Source5: %{name}-snapshot.sh Source6: %{name}-servicemenu.desktop -# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut +# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut instead Patch0: %{name}-fix-help-path.patch +Patch1: %{name}-svn176-fix-make-install.patch +Patch2: %{name}-svn176-fix-help-install-path.patch +Patch3: %{name}-svn176-desktop-additions.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf @@ -54,14 +54,18 @@ %prep +# for release archive +#%#setup -q +# for svn tag %setup -q -n %{name}-svn%{svnrev} %patch0 -b .fix-help-path - +%patch1 -b .fix-make-install +%patch2 -b .fix-help-install +%patch3 -b .desktop-improvements # Fix QTDIR libs in configure sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in - # Avoid stripping binaries sed -i 's,$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT),,' src/Makefile.in @@ -75,31 +79,18 @@ autoconf %configure --with-ffmpeg=%{_prefix} \ --with-ffmpeg-include=%{_includedir}/ffmpeg/ + helpdir=%{_datadir}/%{name} + # It does not compile with smp_mflags make %install -rm -rf %{buildroot} -make install \ - bindir=%{buildroot}%{_bindir} \ - helpdir=%{buildroot}%{_datadir}/%{name} \ - mandir=%{buildroot}%{_mandir} - -# manual install of icons -for iconsize in 16x16 24x24 48x48; do - mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$iconsize/apps/ -done -install -p -m 644 %{SOURCE1} \ - %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -install -p -m 644 %{SOURCE2} \ - %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png -install -p -m 644 %{SOURCE3} \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --vendor="" \ - --dir %{buildroot}%{_datadir}/applications %{SOURCE4} + --dir %{buildroot}%{_datadir}/applications dvbcut.desktop #in future: %{_kde4_servicesdir}, but for now mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ @@ -135,13 +126,35 @@ %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.gz %{_datadir}/applications/*.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/%{name}/dvbcut_*.html %{_kde4_datadir}/kde4/services/*.desktop +%{_datadir}/mime/packages/dvbcut.xml %changelog -* Mon Oct 26 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-10.svn166 +* Mon Apr 25 2011 David Timms <iinet.net.au at dtimms> - 0.6.1-1.svn176 +- update to 0.6.1 release post svn176 +- includes upstream enhancement to work with certain transport streams +- delete upstreamed patches +- update makefile patches +- delete desktop file, patch included desktop file instead. + +* Fri Apr 22 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-13.svn170 +- add patch to fix code to allow build with gcc-4.6 +- add export dialog close button to suit gnome 3 + +* Thu Mar 17 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-12.svn170 +- fix Makefile.in to place files into standard locations +- fix src/Makefile to place online help in standard location +- del old icons +- package new icon and mime info files +- adjust configure/make/install to suit fixed Makefile.in + +* Fri Feb 11 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-11.svn170 +- update to svn170 to pull in gcc-4.5 patches + +* 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 Index: sources =================================================================== RCS file: /cvs/free/rpms/dvbcut/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Oct 2009 12:32:29 -0000 1.4 +++ sources 26 Apr 2011 02:07:33 -0000 1.5 @@ -1 +1 @@ -9f7f4aaf61cf236422c07aa8d8617126 dvbcut-svn166.tar.bz2 +daf673f53f4c3893bd78338a9372cbc4 dvbcut-svn176.tar.bz2 --- dvbcut.desktop DELETED ---