From 8b21e269ccf5e99e9052ea55cf80ed50a85f95b1 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 11 Dec 2023 15:58:51 +0300 Subject: [PATCH] import file-5.33-25.el8 --- SOURCES/file-5.33-thermocam-magic.patch | 49 +++++++++++++++++++++++++ SPECS/file.spec | 8 +++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 SOURCES/file-5.33-thermocam-magic.patch diff --git a/SOURCES/file-5.33-thermocam-magic.patch b/SOURCES/file-5.33-thermocam-magic.patch new file mode 100644 index 0000000..38a1156 --- /dev/null +++ b/SOURCES/file-5.33-thermocam-magic.patch @@ -0,0 +1,49 @@ +diff --git a/magic/Magdir/measure b/magic/Magdir/measure +index f23c1d6..963d85f 100644 +--- a/magic/Magdir/measure ++++ b/magic/Magdir/measure +@@ -8,31 +8,31 @@ + >0 beshort x scale %d- + >2 beshort x \b%d, + >4 lefloat x spot sensor temperature %f, +->9 byte 0 unit celsius, +->9 byte 1 unit fahrenheit, +->8 byte x color scheme %d +->10 byte 1 \b, show spot sensor +->11 byte 1 \b, show scale bar +->12 byte &1 \b, minimum point enabled +->12 byte &2 \b, maximum point enabled ++>9 ubyte 0 unit celsius, ++>9 ubyte 1 unit fahrenheit, ++>8 ubyte x color scheme %d ++>10 ubyte 1 \b, show spot sensor ++>11 ubyte 1 \b, show scale bar ++>12 ubyte &1 \b, minimum point enabled ++>12 ubyte &2 \b, maximum point enabled + >13 lefloat x \b, calibration: offset %f, + >17 lefloat x slope %f + + 0 name diy-thermocam-checker +->9 byte <2 +->>10 byte <2 +->>>11 byte <2 +->>>>12 byte <4 ++>9 ubyte <2 ++>>10 ubyte <2 ++>>>11 ubyte <2 ++>>>>12 ubyte <4 + >>>>>17 lefloat >0.0001 DIY-Thermocam raw data + + # V2 and Leption 3.x: +-38408 byte <19 ++38408 ubyte <19 + >38400 use diy-thermocam-checker + >>38400 default x (Lepton 3.x), + >>>38400 use diy-thermocam-parser + + # V1 or Lepton 2.x +-9608 byte <19 ++9608 ubyte <19 + >9600 use diy-thermocam-checker + >>9600 default x (Lepton 2.x), + >>>9600 use diy-thermocam-parser diff --git a/SPECS/file.spec b/SPECS/file.spec index 001d59a..4b57113 100644 --- a/SPECS/file.spec +++ b/SPECS/file.spec @@ -15,7 +15,7 @@ Summary: A utility for determining file types Name: file Version: 5.33 -Release: 24%{?dist} +Release: 25%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -104,6 +104,9 @@ Patch29: file-5.33-static-PIE-binaries-4.patch # upstream commit: 9c3137904e59d68debb97fceaced46a691ba241a (#2071581) Patch30: file-5.33-static-PIE-binaries-5.patch +# https://github.com/file/file/commit/39e43a669d1260f0df36f0b2e78b3012ffd5f086 (#2158115) +Patch31: file-5.33-thermocam-magic.patch + URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -275,6 +278,9 @@ cd %{py3dir} %endif %changelog +* Thu Apr 20 2023 Vincent Mihalkovic - 5.33-25 +- Improve thermocam magic (rhbz#2158115) + * Wed Feb 22 2023 Vincent Mihalkovic - 5.33-24 - fix detection of static-pie binaries (#2071581)