Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at Tue Jan 18 01:31:11 CET 2011. -------- --- mkvtoolnix/mkvtoolnix.changes 2010-11-10 23:48:45.000000000 +0100 +++ mkvtoolnix/mkvtoolnix.changes 2011-01-17 19:24:36.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Jan 17 18:21:45 UTC 2011 - reddwarf@opensuse.org + +- Fix pre-11.4 build broken in previous commit +- Use new icons/MIME/desktop macros in >= 11.4 + +------------------------------------------------------------------- +Wed Dec 29 15:01:24 CET 2010 - sbrabec@suse.cz + +- Compile with wxWidgets (STL variant). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.9NzMQC/_old 2011-01-18 01:30:43.000000000 +0100 +++ /var/tmp/diff_new_pack.9NzMQC/_new 2011-01-18 01:30:43.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package mkvtoolnix (Version 4.4.0) +# spec file for package mkvtoolnix # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,18 +19,21 @@ Name: mkvtoolnix Version: 4.4.0 -Release: 2 +Release: 3 License: GPLv2+ Summary: Tools to Create, Alter, and Inspect Matroska Files Url: http://www.bunkus.org/videotools/mkvtoolnix/ Group: Productivity/Multimedia/Other -Source: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM %{name}-4.4.0-guide-install.patch emailed_upstream reddwarf@opensuse.org -- Install docs in %{_docdir}. Patch0: %{name}-4.4.0-guide_install.patch +Requires: hicolor-icon-theme BuildRequires: boost-devel BuildRequires: file-devel BuildRequires: flac-devel BuildRequires: gcc-c++ +# Needed because of scriplets macros and directory ownership check +BuildRequires: hicolor-icon-theme BuildRequires: libebml-devel >= 1.0.0 BuildRequires: libexpat-devel BuildRequires: libmatroska-devel >= 1.0.0 @@ -38,10 +41,19 @@ BuildRequires: lzo-devel BuildRequires: ruby BuildRequires: update-desktop-files +%if 0%{?suse_version} >= 1140 +BuildRequires: wxWidgets-devel +# Needed because of scriplets macros +BuildRequires: desktop-file-utils +BuildRequires: shared-mime-info +%else BuildRequires: wxGTK-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(post): shared-mime-info -Requires(postun): shared-mime-info +%if 0%{?suse_version} >= 1140 +%define _use_internal_dependency_generator 0 +%define __find_requires %wx_requires +%endif %description Tools to create and manipulate Matroska files (extensions .mkv and .mka), a new @@ -69,11 +81,23 @@ %clean %{__rm} -rf %{buildroot} -%post +%postun +%if 0%{?suse_version} >= 1140 +%icon_theme_cache_postun +%desktop_database_postun +%mime_database_postun +%else %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +%endif -%postun +%posttrans +%if 0%{?suse_version} >= 1140 +%icon_theme_cache_post +%desktop_database_post +%mime_database_post +%else %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +%endif %files -f %{name}.lang %defattr (0644, root, root, 0755) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org