From 8c54a7926bcb51db77f322115cc8aeff9942f1a1 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 22 May 2024 13:44:33 +0000 Subject: [PATCH] import UBI shared-mime-info-1.9-4.el8 --- ...02-Fix-detection-of-executable-files.patch | 41 +++++++++++++++++++ SPECS/shared-mime-info.spec | 10 ++++- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 SOURCES/0002-Fix-detection-of-executable-files.patch diff --git a/SOURCES/0002-Fix-detection-of-executable-files.patch b/SOURCES/0002-Fix-detection-of-executable-files.patch new file mode 100644 index 0000000..dae7196 --- /dev/null +++ b/SOURCES/0002-Fix-detection-of-executable-files.patch @@ -0,0 +1,41 @@ +diff -up shared-mime-info-1.9/freedesktop.org.xml.in.2 shared-mime-info-1.9/freedesktop.org.xml.in +--- shared-mime-info-1.9/freedesktop.org.xml.in.2 2023-12-08 10:47:31.309147409 +0100 ++++ shared-mime-info-1.9/freedesktop.org.xml.in 2023-12-08 10:47:34.293185260 +0100 +@@ -1919,14 +1919,10 @@ command to generate the output files. + + + +- +- +- ++ + + +- +- +- ++ + + + +@@ -3459,20 +3455,9 @@ command to generate the output files. + + <_comment>shared library + +- +- +- +- +- +- +- +- +- +- + + + +- + + + diff --git a/SPECS/shared-mime-info.spec b/SPECS/shared-mime-info.spec index 18b7a7f..f5cdf0b 100644 --- a/SPECS/shared-mime-info.spec +++ b/SPECS/shared-mime-info.spec @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 1.9 -Release: 3%{?dist} +Release: 4%{?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 +# https://issues.redhat.com/browse/RHEL-5727 +Patch1: 0002-Fix-detection-of-executable-files.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel BuildRequires: glib2-devel @@ -42,7 +45,7 @@ a file. This is generally done by examining the file's name or contents, and looking up the correct MIME type in a database. %prep -%autosetup +%autosetup -S gendiff %build %configure --disable-silent-rules --disable-update-mimedb @@ -99,6 +102,9 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||: %{_mandir}/man*/* %changelog +* Fri Dec 08 2023 Milan Crha - 1.9-4 +- Resolves: RHEL-5727 (Fix detection of executable files) + * Fri Feb 09 2018 Fedora Release Engineering - 1.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild