Dominique Leuenberger 2015-09-17 12:52:25 +00:00 committed by Git OBS Bridge
parent d12dbcf793
commit 016e78ca9d
5 changed files with 41 additions and 32 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1
size 537916

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180
size 559040

View File

@ -1,25 +0,0 @@
From 824cff3da0f17812715795f0e64a47f7331a338b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 18 Feb 2015 10:37:36 +0100
Subject: Bump priority for ISO images glob matching
To work-around file managers that cannot use magic to differentiate
mime-types.
https://bugs.freedesktop.org/show_bug.cgi?id=80877
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 64f34b9..59e399c 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -1499,7 +1499,7 @@ command to generate the output files.
<_comment>raw CD image</_comment>
<sub-class-of type="application/x-raw-disk-image"/>
<alias type="application/x-iso9660-image"/>
- <glob pattern="*.iso"/>
+ <glob pattern="*.iso" weight="80"/>
<glob pattern="*.iso9660"/>
</mime-type>
<mime-type type="application/x-cdrdao-toc">
--
cgit v0.10.2

View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Wed Sep 16 20:38:43 UTC 2015 - zaitor@opensuse.org
- Update to version 1.5:
+ Fix compilation with glib < 2.26.
+ Update DTD.
+ Mime-type changes:
- Add more globs to console ROM files.
- Use "folder" generic-icon for inode/directory.
- Bump priority for ISO images glob matching to work around
confusion around Wii image files.
- Add application/owl+xml.
- Add text/turtle.
- Use IANA registered image/vnd.zbrush.pcx for PCX.
- Add text/rust for Rust source code.
- Add application/ld+json as subclass of application/json.
- Add text/csv-schema.
- Add application/vnd.coffeescript.
- Make application/vnd.apple.mpegurl a subclass of text/plain.
- Make application/sdp a subclass of text/plain.
- Add application/jrd+json as subclass of application/json.
- Add MTM, MED, 699 and Ultratracker magic for
application/x-mod.
- Add Meson build definitions.
- Match newer versions of XCF files.
- Use IANA registered type for PKCS#12.
- Add application/x-doom-wad.
- Add Amiga disk image.
- Rename "Dreamcast ROM" to "Dreamcast GD-ROM".
- Add application/x-wii-wad.
- Add magic and tests to application/x-gameboy-rom.
- Add application/x-saturn-rom.
- Fix application/x-genesis-rom translation rules.
- Split up multi-page DjVu into its own mime-type.
- Drop shared-mime-info-bump-priority-for-ISO-images.patch: Fixed
upstream (fdo#80877).
-------------------------------------------------------------------
Thu Feb 19 09:41:10 UTC 2015 - dimstar@opensuse.org

View File

@ -17,7 +17,7 @@
Name: shared-mime-info
Version: 1.4
Version: 1.5
Release: 0
# FIXME: Remove workaround for fdo#70366 once fixed
Url: http://freedesktop.org/wiki/Software/shared-mime-info
@ -27,8 +27,6 @@ Group: System/X11/Utilities
Source: http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.xz
Source1: mime-info-to-mime
Source2: macros.shared-mime-info
# PATCH-FIX-UPSTREAM shared-mime-info-bump-priority-for-ISO-images.patch fdo#80877 kde#337035 boo#904100 hrvoje.senjan@gmail.com -- work-around file managers that cannot use magic to differentiate mime-types
Patch0: shared-mime-info-bump-priority-for-ISO-images.patch
BuildRequires: glib2-devel
BuildRequires: intltool
BuildRequires: libxml2-devel
@ -61,7 +59,6 @@ This package contains:
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build