rpms/mkvtoolnix/devel mkvinfo.desktop, NONE, 1.1 mkvtoolnix.spec, NONE, 1.1 mmg.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/extras/rpms/mkvtoolnix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10143/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mkvinfo.desktop mkvtoolnix.spec mmg.desktop 
Log Message:
auto-import mkvtoolnix-1.8.1-1 on branch devel from mkvtoolnix-1.8.1-1.src.rpm


--- NEW FILE mkvinfo.desktop ---
[Desktop Entry]
Name=mkvinfo
Comment=Show information about tracks in Matroska files
Exec=mkvinfo -g
Icon=mkvinfo
Terminal=false
Encoding=UTF-8
Type=Application
MimeType=video/x-matroska;audio/x-matroska;application/x-matroska;
Categories=AudioVideo;GTK;


--- NEW FILE mkvtoolnix.spec ---
Summary: Matroska container manipulation utilities
Name: mkvtoolnix
Version: 1.8.1
Release: 1%{?dist}
License: GPL
Group: Applications/Multimedia
Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
Source1: mmg.desktop
Source2: mkvinfo.desktop
URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: flac-devel >= 1.1.1
BuildRequires: libebml-devel >= 0.7.7
BuildRequires: libmatroska-devel >= 0.8.0
BuildRequires: libogg-devel
BuildRequires: libvorbis-devel
BuildRequires: pcre-devel
BuildRequires: zlib-devel
BuildRequires: expat-devel
BuildRequires: lzo-devel
BuildRequires: bzip2-devel
BuildRequires: wxGTK-devel

%description
Mkvtoolnix is a set of utilities to mux and demux audio, video and subtitle
streams into and from Matroska containers.

%package gui
Summary: Mkvtoolnix GUI
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}

%description gui
GUI for mkvtoolnix.

%prep
%setup -q
sed -i -e 's/"-O3"/""/' configure*

%build
%configure
%{__make} %{?_smp_mflags} V=1

%install  
rm -rf $RPM_BUILD_ROOT
%{__make} DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true install
desktop-file-install \
  --vendor=livna \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --mode=644 \
  %{SOURCE1}
install -Dpm 644 src/mmg/matroskalogo.xpm \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
desktop-file-install \
  --vendor=livna \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --mode=644 \
  %{SOURCE2}
install -Dpm 644 src/info/matroska.xpm \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mkvinfo.xpm

%clean
rm -rf $RPM_BUILD_ROOT

%post gui
update-desktop-database &>/dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun gui
update-desktop-database &>/dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(644,root,root,0755)
%doc AUTHORS COPYING README ChangeLog TODO
%attr(755,root,root) %{_bindir}/base64tool
%attr(755,root,root) %{_bindir}/mkvextract
%attr(755,root,root) %{_bindir}/mkvmerge
%{_mandir}/man1/base64tool*
%{_mandir}/man1/mkvextract*
%{_mandir}/man1/mkvmerge*

%files gui
%doc doc/mkvmerge-gui.html
%defattr(644,root,root,0755)
%attr(755,root,root) %{_bindir}/mkvinfo
%attr(755,root,root) %{_bindir}/mmg
%{_mandir}/man1/mkvinfo*
%{_mandir}/man1/mmg*
%{_datadir}/%{name}
%{_datadir}/applications/*-mkvinfo.desktop
%{_datadir}/applications/*-mmg.desktop
%{_datadir}/icons/hicolor/32x32/apps/mkvinfo.xpm
%{_datadir}/icons/hicolor/32x32/apps/mmg.xpm

%changelog
* Tue Dec 05 2006 Dominik Mierzejewski <rpm at greysector.net> 1.8.1-1
- updated to 1.8.1

* Sun Nov 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.8.0-3
- Update GTK icon cache in -gui's post(un)install phase, not main pkg's.
- Add menu entry for mkvinfo.

* Thu Nov 23 2006 Dominik Mierzejewski <rpm at greysector.net> 1.8.0-2
- moved mkvinfo and its manpage to -gui
- dropped --enable-debug from configure

* Sun Nov 19 2006 Dominik Mierzejewski <rpm at greysector.net> 1.8.0-1
- updated to 1.8.0
- prevent stripping binaries during make install
- removed sed from BRs
- made -gui Require: current version of the main package
- specfile cleanups

* Fri Jul 28 2006 Dominik Mierzejewski <rpm at greysector.net> 1.7.0-1
- updated to 1.7.0
- removed FCver dependent BRs

* Sun Apr 02 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6.5-3
- added missing BRs
- enable all deps by default

* Sat Jan 07 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6.5-2
- added desktop file and icon for GUI
- remove hardcoded -O3 from configure's CFLAGS

* Fri Jan 06 2006 Dominik Mierzejewski <rpm at greysector.net>
- dropped RH7.x support
- specfile cleanups

* Sun Dec 11 2005 Dominik Mierzejewski <rpm at greysector.net>
- updated to 1.6.5
- updated BuildRequires

* Thu Jul 07 2005 Dominik Mierzejewski <rpm at greysector.net>
- updated to 1.5.0

* Mon Apr 11 2005 Dominik Mierzejewski <rpm at greysector.net>
- fixed BRs for Fedoras

* Wed Jan 12 2005 Dominik Mierzejewski <rpm at greysector.net>
- fixed rebuilding under RH7.3

* Sat Jan 08 2005 Dominik Mierzejewski <rpm at greysector.net>
- updated to 1.0.1

* Sat Oct 16 2004 Dominik Mierzejewski <rpm at greysector.net>
- arranged sections in correct order
- split GUI into separate package
- added some bconds

* Sat Jan 02 2004 Ronald Bultje <rbultje at ronald.bitfreak.net
- set this thing up


--- NEW FILE mmg.desktop ---
[Desktop Entry]
Name=mkvmerge GUI
Comment=Merge multimedia streams into a Matroska file
Exec=mmg
Icon=mmg
Terminal=false
Encoding=UTF-8
Type=Application
Categories=AudioVideo;GTK;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Dec 2006 12:10:45 -0000	1.1
+++ .cvsignore	6 Dec 2006 12:16:36 -0000	1.2
@@ -0,0 +1 @@
+mkvtoolnix-1.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Dec 2006 12:10:45 -0000	1.1
+++ sources	6 Dec 2006 12:16:36 -0000	1.2
@@ -0,0 +1 @@
+d8afc54ac136af8061c0e2f42de198cf  mkvtoolnix-1.8.1.tar.bz2