upgrade to 2.2

backport-migrate-from-custom-itstool-to-builtin-msgfmt-for-creating-translated-XML.patch

@@ -1,102 +0,0 @@
-From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Mon, 8 Nov 2021 18:22:47 -0500
-Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
- translated XML
-
-gettext upstream has supported this for a very long time (since 0.19.7
-via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
-and itstool is (mostly) a legacy of the time before gettext had proper
-support for these sorts of use cases.
-
-This is similar to the state of intltool, which is described at
-https://wiki.gnome.org/MigratingFromIntltoolToGettext
-
-During the port from autotools to meson, the legacy use of itstool was
-faithfully translated to meson in the only way possible: by jumping
-through hoops to run ninja inside ninja in order to generate the .mo
-files for itstool, because meson's i18n module used a flawed design and
-there was no "real" target to create those files, only a .PHONY
-run_target which other rules cannot depend on.
-
-Although meson 0.60.0 added support for real targets for the built .mo
-files, this changed the rules for output filenames, breaking the script.
-
-But msgfmt does not care, and anyways comes with builtin meson functions
-for convenient use with XML files. So let's take this opportunity to
-drop legacy dependencies and use the modern, builtin tooling, which
-fixes this bug as a side effect.
-
-Fixes #170
-
-Reference:https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/5a406b06792e26a83c7346b3c2443c0bd8d4cdb2
-
----
- data/freedesktop_generate.sh | 12 ------------
- data/meson.build             | 17 ++++++-----------
- meson.build                  |  1 -
- 3 files changed, 6 insertions(+), 24 deletions(-)
- delete mode 100755 data/freedesktop_generate.sh
-
-diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
-deleted file mode 100755
-index ff13e75..0000000
---- a/data/freedesktop_generate.sh
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#!/bin/sh -e
--
--src_root="$1"
--build_root="$2"
--
--ninja -C "${build_root}" shared-mime-info-gmo
--
--itstool \
--    --its "${src_root}/data/its/shared-mime-info.its" \
--    --join "${src_root}/data/freedesktop.org.xml.in" \
--    -o "${build_root}/data/freedesktop.org.xml" \
--    "${build_root}/po/"*".gmo"
-diff --git a/data/meson.build b/data/meson.build
-index 263567d..69ac56b 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,18 +1,13 @@
- 
- install_man('update-mime-database.1')
- 
--freedesktop_org_xml = custom_target('freedesktop.org.xml',
--    input : files(
--        'freedesktop.org.xml.in',
--        'its/shared-mime-info.its',
--        'its/shared-mime-info.loc',
--    ),
-+freedesktop_org_xml = i18n.merge_file(
-+    input: 'freedesktop.org.xml.in',
-     output: 'freedesktop.org.xml',
--    command: [
--        find_program('freedesktop_generate.sh'),
--        meson.source_root(),
--        meson.build_root()
--    ],
-+    data_dirs: '.',
-+    po_dir: '../po',
-+    type: 'xml',
-+
-     install: true,
-     install_dir: get_option('datadir') / 'mime' / 'packages',
- )
-diff --git a/meson.build b/meson.build
-index 9a28573..b696baf 100644
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version())
- ###############################################################################
- # Find tools
- 
--itstool = find_program('itstool')
- xmllint = find_program('xmllint')
- xmlto   = find_program('xmlto')
- 
--- 
-2.33.0
-

shared-mime-info.spec

@@ -1,15 +1,13 @@
 Name:	    shared-mime-info	
-Version:	2.1
-Release:	2
+Version:	2.2
+Release:	1
 Summary:	Shared MIME information database
 License:	GPLv2+
 URL:		https://freedesktop.org/wiki/Software/shared-mime-info/
-
-Source0:	https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz
+Source0:	https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version}/shared-mime-info-%{version}.tar.gz
 Source1:    mimeapps.list
 
 Patch0:     0001-Remove-sub-classing-from-OO.o-mime-types.patch
-Patch1:     backport-migrate-from-custom-itstool-to-builtin-msgfmt-for-creating-translated-XML.patch
 
 BuildRequires:	gcc libxml2-devel glib2-devel gettext intltool perl-XML-Parser meson itstool xmlto
 
@@ -28,14 +26,10 @@ the maintainers.
 %autosetup -n %{name}-%{version} -p1 
 
 %build
-#%%configure  --disable-silent-rules  --disable-update-mimedb
-#make
 %meson
 %meson_build
 
 %install
-#PKGSYSTEM_ENABLE_FSYNC=0 \
-#%%make_install
 %meson_install
 
 find $RPM_BUILD_ROOT%{_datadir}/mime -type d \
@@ -46,8 +40,6 @@ find $RPM_BUILD_ROOT%{_datadir}/mime -type f -not -path "*/packages/*" \
 install -d  $RPM_BUILD_ROOT%{_datadir}/applications
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/mimeapps.list
 
-
-
 %check
 %meson_test
 
@@ -75,6 +67,9 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 %{_mandir}/man1/*.gz
 
 %changelog
+* Sat Oct 29 2022 wangkerong <wangkeorng@h-partners.com> - 2.2-1
+- Upgrade to 2.2
+
 * Mon Jun 20 2022 hanhui <hanhui15@h-partners.com> - 2.1-2
 - migrate from custom itstool to builtin msgfmt for creating translated XML