rpms/mkvtoolnix/F-9 mkvtoolnix.spec, 1.7, 1.8 mkvtoolnix-gcc43.patch, 1.5, NONE

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29654

Modified Files:
	mkvtoolnix.spec 
Removed Files:
	mkvtoolnix-gcc43.patch 
Log Message:
* Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
- dropped obsolete mkvtoolnix-gcc43.patch
- fixed boost detection on ppc64 (and sparc64) (bug #473976)
- updated to 2.4.0
- added new BRs
- added missing Requires: hicolor-icon-theme for hicolor icon dirs
- build and include more tools
- fixed rpmlint issues



Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-9/mkvtoolnix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mkvtoolnix.spec	1 Jun 2008 09:33:44 -0000	1.7
+++ mkvtoolnix.spec	1 Dec 2008 21:04:19 -0000	1.8
@@ -1,16 +1,18 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.2.0
+Version: 2.4.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
-Patch0: %{name}-gcc43.patch
+Patch1: %{name}-boost-lib64.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
+BuildRequires: file-devel
 BuildRequires: flac-devel >= 1.1.1
 BuildRequires: libmatroska-devel >= 0.8.1
 BuildRequires: libvorbis-devel
@@ -29,22 +31,29 @@
 Summary: Mkvtoolnix GUI
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires: hicolor-icon-theme
 
 %description gui
 GUI for mkvtoolnix.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .lib64
 sed -i -e 's/"-O3"/""/' configure*
+for file in AUTHORS ChangeLog ; do
+  iconv -f iso8859-1 -t utf8 $file >$file.utf && \
+  touch -r $file $file.utf && \
+  mv $file.utf $file
+done
 
 %build
-%configure
+%configure || cat config.log
 %{__make} %{?_smp_mflags} V=1
+%{__make} %{?_smp_mflags} V=1 TOOLS=1 -C src
 
-%install  
+%install
 rm -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true install
+%{__make} DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true TOOLS=1 install
 desktop-file-install \
   --vendor=livna \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -81,15 +90,18 @@
 %defattr(644,root,root,0755)
 %doc AUTHORS COPYING README ChangeLog TODO
 %attr(755,root,root) %{_bindir}/base64tool
+%attr(755,root,root) %{_bindir}/diracparser
+%attr(755,root,root) %{_bindir}/ebml_validator
 %attr(755,root,root) %{_bindir}/mkvextract
 %attr(755,root,root) %{_bindir}/mkvmerge
+%attr(755,root,root) %{_bindir}/vc1parser
 %{_mandir}/man1/base64tool*
 %{_mandir}/man1/mkvextract*
 %{_mandir}/man1/mkvmerge*
 
 %files gui
-%doc doc/mkvmerge-gui.html
 %defattr(644,root,root,0755)
+%doc doc/mkvmerge-gui.html
 %attr(755,root,root) %{_bindir}/mkvinfo
 %attr(755,root,root) %{_bindir}/mmg
 %{_mandir}/man1/mkvinfo*
@@ -101,6 +113,15 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
+- dropped obsolete mkvtoolnix-gcc43.patch
+- fixed boost detection on ppc64 (and sparc64) (bug #473976)
+- updated to 2.4.0
+- added new BRs
+- added missing Requires: hicolor-icon-theme for hicolor icon dirs
+- build and include more tools
+- fixed rpmlint issues
+
 * Sun Jun 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.2.0-1
 - updated to 2.2.0
 - dropped redundant BRs


--- mkvtoolnix-gcc43.patch DELETED ---