diff --git a/.gitignore b/.gitignore index 3956a99..a2ebe0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,4 @@ -shared-mime-info-0.71.tar.bz2 -/shared-mime-info-0.80.tar.bz2 -/shared-mime-info-0.90.tar.bz2 -/shared-mime-info-0.91.tar.xz -/shared-mime-info-1.0.tar.xz -/shared-mime-info-1.1.tar.xz -/shared-mime-info-1.2.tar.xz -/shared-mime-info-1.3.tar.xz -/shared-mime-info-1.4.tar.xz -/shared-mime-info-1.5.tar.xz -/shared-mime-info-1.6.tar.xz -/shared-mime-info-1.7.tar.xz -/shared-mime-info-1.8.tar.xz -/shared-mime-info-1.9.tar.xz -/shared-mime-info-1.10.tar.xz -/shared-mime-info-1.11.tar.xz -/shared-mime-info-1.12.tar.xz -/shared-mime-info-1.13.tar.xz -/shared-mime-info-1.13.1.tar.xz -/shared-mime-info-1.14.tar.xz -/shared-mime-info-1.15.tar.xz -/shared-mime-info-2.0.tar.xz -/xdgmime-6663a2288d11b37bc07f5a01b4b85dcd377787e1.tar.bz2 +/shared-mime-info-*.tar.bz2 +/shared-mime-info-*.tar.xz +/shared-mime-info-*/ +/xdgmime-*.tar.bz2 diff --git a/0001-data-Fix-pkg-config-installation-path.patch b/0001-data-Fix-pkg-config-installation-path.patch deleted file mode 100644 index e694928..0000000 --- a/0001-data-Fix-pkg-config-installation-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6bf9e4ff0fb7eff11a02bd937045bf5dc291841a Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -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 - diff --git a/shared-mime-info.spec b/shared-mime-info.spec index c812b00..7111ccf 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -1,22 +1,20 @@ Summary: Shared MIME information database Name: shared-mime-info -Version: 2.0 -Release: 5%{?dist} +Version: 2.1 +Release: 1%{?dist} License: GPLv2+ URL: http://freedesktop.org/Software/shared-mime-info -Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-2.0.tar.xz +Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz Source1: mimeapps.list -# Tarball for https://gitlab.freedesktop.org/xdg/xdgmime/-/tree/6663a2288d11b37bc07f5a01b4b85dcd377787e1 -Source6: https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/6663a2288d11b37bc07f5a01b4b85dcd377787e1/xdgmime-6663a2288d11b37bc07f5a01b4b85dcd377787e1.tar.bz2 +%global xdgmime_commit de283fc430460b9b3a7e61432a6d273cd64cb102 +# Tarball for https://gitlab.freedesktop.org/xdg/xdgmime/-/tree/%%{xdgmime_commit} +Source6: https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/%{xdgmime_commit}/xdgmime-%{xdgmime_commit}.tar.bz2 # Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354 Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch -# https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/80 -Patch1: 0001-data-Fix-pkg-config-installation-path.patch - BuildRequires: gcc BuildRequires: libxml2-devel BuildRequires: xmlto @@ -41,7 +39,7 @@ and looking up the correct MIME type in a database. %prep %autosetup -S git_am tar xjf %SOURCE6 -mv xdgmime-*/ xdgmime/ +mv xdgmime-%{xdgmime_commit}/ xdgmime/ %build %make_build -C xdgmime @@ -95,6 +93,10 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||: %{_datadir}/gettext/its/shared-mime-info.loc %changelog +* Mon Jan 04 2021 Miro Hrončok - 2.1-1 +- Update to 2.1 +- Fixes: rhbz#1911850 + * Sun Nov 8 2020 Miro Hrončok - 2.0-5 - Own the generated files (as %%ghosts) - Fixes: rhbz#1486468 diff --git a/sources b/sources index 47fd6e1..8f3ff59 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xdgmime-6663a2288d11b37bc07f5a01b4b85dcd377787e1.tar.bz2) = 3dba3960edc4881df7ac0120c97ed2f69127365eac25b678df127c2febfaa9518e2e39b4e7713f44b131f8ce20b3100dc3676636bc705018e6ced3e9f7289875 -SHA512 (shared-mime-info-2.0.tar.xz) = f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085 +SHA512 (xdgmime-de283fc430460b9b3a7e61432a6d273cd64cb102.tar.bz2) = 516d460cfb05f3dc240f22c4571d4f052aeb78a8f3bf69f23b487b1278025e1296efc38f87234a5504a9d1262930ae8c553d190c1a1d950ab6bb675c080acc1c +SHA512 (shared-mime-info-2.1.tar.xz) = 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0