Allow detecting multi-page DjVu files by filename

This commit is contained in:
Bastien Nocera 2016-06-04 18:02:44 +02:00
parent 85123fce50
commit 5578970bc5
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From e0f51b2ccda6f403f2b3abc4045d930feda765fc Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 27 May 2016 18:05:19 +0200
Subject: [PATCH] Fix multi-page DjVu detection by file
We need to have the same globs for both image/vnd.djvu+multipage and
image/vnd.djvu so that checking by file will force checking by magic,
otherwise all the multi-page files will be detected as simple
image/vnd.djvu.
---
freedesktop.org.xml.in | 2 ++
tests/list | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index c8d0361..d33063b 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -4670,6 +4670,8 @@ command to generate the output files.
</match>
</magic>
<sub-class-of type="image/vnd.djvu"/>
+ <glob pattern="*.djvu"/>
+ <glob pattern="*.djv"/>
</mime-type>
<mime-type type="image/dpx">
<_comment>DPX image</_comment>

View File

@ -1,7 +1,7 @@
Summary: Shared MIME information database
Name: shared-mime-info
Version: 1.6
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://freedesktop.org/Software/shared-mime-info
@ -20,6 +20,9 @@ Source4: eog-defaults.list
# Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354
Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch
# Upstream patch
Patch1: 0001-Fix-multi-page-DjVu-detection-by-file.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel
BuildRequires: glib2-devel
@ -102,6 +105,9 @@ update-mime-database -n %{_datadir}/mime
%{_mandir}/man*/*
%changelog
* Sat Jun 04 2016 Bastien Nocera <bnocera@redhat.com> - 1.6-2
- Allow detecting multi-page DjVu files by filename
* Tue Feb 23 2016 Bastien Nocera <bnocera@redhat.com> 1.6-1
- Update to 1.6