[mkvtoolnix] update to 6.6.0

Dominik Mierzejewski rathann at fedoraproject.org
Fri Dec 27 18:24:41 UTC 2013


commit 0e17cf0ab0fac75daa4943578055035795e85fbf
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Fri Dec 27 19:24:25 2013 +0100

    update to 6.6.0
    
    - drop obsolete/redundant specfile parts
    - remove executable bit from some sources
    - drop version from libmatroska-devel BR
    - disable curl support (used only for online update checks)

 .gitignore      |    1 +
 mkvtoolnix.spec |   19 +++++++++++--------
 sources         |    2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 129550f..4cbf4da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /mkvtoolnix-6.3.0.tar.xz
 /mkvtoolnix-6.4.1.tar.xz
 /mkvtoolnix-6.5.0.tar.xz
+/mkvtoolnix-6.6.0.tar.xz
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 27cddaf..71fa998 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -1,12 +1,11 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 6.5.0
+Version: 6.6.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.xz
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
-BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel
 BuildRequires: desktop-file-utils
@@ -15,7 +14,7 @@ BuildRequires: file-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: libcurl-devel
-BuildRequires: libmatroska-devel >= 1.0.0
+BuildRequires: libmatroska-devel
 BuildRequires: libvorbis-devel
 BuildRequires: lzo-devel
 BuildRequires: po4a
@@ -48,13 +47,13 @@ for file in AUTHORS ChangeLog ; do
   touch -r $file $file.utf && \
   mv $file.utf $file
 done
+chmod -x src/input/r_flv.{h,cpp}
 
 %build
-%configure --with-boost-libdir=%{_libdir} || cat config.log
+%configure --with-boost-libdir=%{_libdir} --without-curl || cat config.log
 ./drake %{?_smp_mflags} TOOLS=1 V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
 ./drake DESTDIR=$RPM_BUILD_ROOT TOOLS=1 install
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -80,9 +79,6 @@ install -pm 755 src/tools/{base64tool,diracparser,ebml_validator,vc1parser} $RPM
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post gui
 update-desktop-database &>/dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -150,6 +146,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/mime/packages/mkvtoolnix.xml
 
 %changelog
+* Fri Dec 27 2013 Dominik Mierzejewski <rpm at greysector.net> 6.6.0-1
+- update to 6.6.0
+- drop obsolete/redundant specfile parts
+- remove executable bit from some sources
+- drop version from libmatroska-devel BR
+- disable curl support (used only for online update checks)
+
 * Sun Oct 20 2013 Nicolas Chauvet <kwizart at gmail.com> - 6.5.0-1
 - Update to 6.5.0
 - Fix duplicate localized man pages and add lang(de)
diff --git a/sources b/sources
index 5307f47..292f57d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2d8d539b8cb9249b6c398690bc61c78  mkvtoolnix-6.5.0.tar.xz
+1e952a3196b0c43150801eeaecba68ed  mkvtoolnix-6.6.0.tar.xz


More information about the scm-commits mailing list