Accepting request 864451 from GNOME:Factory

- update to 2.1:
  * New maintainers: David Faure and Ville Skyttä
  * Adapt to xdgmime behaviour change: in case of multiple glob matches, and the magic match is unrelated to all of them, ignore the magic and pick one of the glob matches. xdgmime was actually deviating from the spec on this. (#138)
  * Improve text/vnd.trolltech.linguist magic to reduce false positives for MPEG TS files (#10)
  * audio/mpeg: add layer 2, 2.5, and 1 protected magics (#46)
  * Add many aliases for image/x-tga
  * audio/x-mod: improve magic for 669 Composer files (#144)
  * Add mime-type image/ktx2 (Khronos image texture format version 2)
  * application/oxps: differentiate from /vnd.ms-xpsdocument
  * Make image/g3fax the canonical name for image/fax-g3
  * Make text/vnd.trolltech.linguist the canonical name for text/vnd.qt.linguist
  * Make application/vnd.smaf the canonical name for application/x-smaf
  * Make application/vnd.apple.keynote the canonical name for application/x-iwork-keynote-sffkey
  * Add mime-type image/astc (Adaptive Scalable Texture Compression files)
  * Add mime-type for SageMath script files (*.sage)
  * Add mime-type for Kaitai Struct
  * Remove application/x-dc-rom
  * Add mime-type for MAME compressed hard disk image (application/x-mame-chd)
  * Add mime-types application/nintendo-3ds-executable, application/x-nintendo-3ds-rom
  * Add mime-types application/x-dreamcast-rom, application/x-gd-rom-cue, application/x-discjuggler-cd-image
  * Add mime-type application/x-compressed-iso (*.cso)
  * Remove image/avif-sequence
  * Fix application/x-sharedlib vs application/x-executable confusion for PIE executables (#11) 
- drop smi-Fix-pkg-config-installation-path.patch (obsolete)

OBS-URL: https://build.opensuse.org/request/show/864451
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shared-mime-info?expand=0&rev=65

shared-mime-info-2.0.tar.xz

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

shared-mime-info-2.1.tar.xz

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

shared-mime-info.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Wed Jan  6 12:41:52 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.1:
+  * New maintainers: David Faure and Ville Skyttä
+  * Adapt to xdgmime behaviour change: in case of multiple glob matches, and the magic match is unrelated to all of them, ignore the magic and pick one of the glob matches. xdgmime was actually deviating from the spec on this. (#138)
+  * Improve text/vnd.trolltech.linguist magic to reduce false positives for MPEG TS files (#10)
+  * audio/mpeg: add layer 2, 2.5, and 1 protected magics (#46)
+  * Add many aliases for image/x-tga
+  * audio/x-mod: improve magic for 669 Composer files (#144)
+  * Add mime-type image/ktx2 (Khronos image texture format version 2)
+  * application/oxps: differentiate from /vnd.ms-xpsdocument
+  * Make image/g3fax the canonical name for image/fax-g3
+  * Make text/vnd.trolltech.linguist the canonical name for text/vnd.qt.linguist
+  * Make application/vnd.smaf the canonical name for application/x-smaf
+  * Make application/vnd.apple.keynote the canonical name for application/x-iwork-keynote-sffkey
+  * Add mime-type image/astc (Adaptive Scalable Texture Compression files)
+  * Add mime-type for SageMath script files (*.sage)
+  * Add mime-type for Kaitai Struct
+  * Remove application/x-dc-rom
+  * Add mime-type for MAME compressed hard disk image (application/x-mame-chd)
+  * Add mime-types application/nintendo-3ds-executable, application/x-nintendo-3ds-rom
+  * Add mime-types application/x-dreamcast-rom, application/x-gd-rom-cue, application/x-discjuggler-cd-image
+  * Add mime-type application/x-compressed-iso (*.cso)
+  * Remove image/avif-sequence
+  * Fix application/x-sharedlib vs application/x-executable confusion for PIE executables (#11) 
+- drop smi-Fix-pkg-config-installation-path.patch (obsolete)
+
 -------------------------------------------------------------------
 Tue May 19 18:08:38 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 

shared-mime-info.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package shared-mime-info
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,10 @@
 #
 
 
-%define commitid 0440063a2e6823a4b1a6fb2f2af8350f
+%define commitid 0ee50652091363ab0d17e335e5e74fbe
 
 Name:           shared-mime-info
-Version:        2.0
+Version:        2.1
 Release:        0
 Summary:        Shared MIME Database
 License:        GPL-2.0-or-later
@@ -27,9 +27,6 @@ Group:          System/X11/Utilities
 URL:            https://gitlab.freedesktop.org/xdg/shared-mime-info
 Source0:        %{url}/uploads/%{commitid}/%{name}-%{version}.tar.xz
 Source1:        macros.shared-mime-info
-# PATCH-FIX-UPSTREAM smi-Fix-pkg-config-installation-path.patch -- Fix pkg-config installation path
-Patch0:         smi-Fix-pkg-config-installation-path.patch
-
 BuildRequires:  glib2-devel
 BuildRequires:  itstool
 BuildRequires:  libxml2-devel

smi-Fix-pkg-config-installation-path.patch

@@ -1,22 +0,0 @@
-From 6bf9e4ff0fb7eff11a02bd937045bf5dc291841a Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 6 May 2020 16:48:47 +0200
-Subject: [PATCH] data: Fix pkg-config installation path
-
----
- data/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/meson.build b/data/meson.build
-index 25ce031..e22b544 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -38,4 +38,5 @@ pkgconfig.generate(
-     name: 'shared-mime-info',
-     description: 'Freedesktop common MIME database',
-     version: meson.project_version(),
-+    install_dir: get_option('datadir') / 'pkgconfig'
- )
--- 
-2.26.2
-