From 0b3967d02e9d2237e4feab058437ea0bd58bf900 Mon Sep 17 00:00:00 2001 From: Zhiqiang Liu Date: Tue, 21 Jul 2020 19:56:05 +0800 Subject: [PATCH] file: update to 5.39 version file: update to 5.39 version here we tmp remove 'make check' because the test needs to install the built rpm firstly. Signed-off-by: Zhiqiang Liu Conflicts: 0001-file-localmagic.patch file.spec --- 0001-file-localmagic.patch | 4 ++++ file.spec | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/0001-file-localmagic.patch b/0001-file-localmagic.patch index 895f5ee..2feb04b 100644 --- a/0001-file-localmagic.patch +++ b/0001-file-localmagic.patch @@ -61,3 +61,7 @@ index 1437bcc..b609dd1 100644 if (map == NULL) -- 1.8.3.1 +<<<<<<< HEAD:0001-file-localmagic.patch +======= + +>>>>>>> 68b4b5a... file: update to 5.39 version:0001-file-localmagic.patch diff --git a/file.spec b/file.spec index b26f858..02805f2 100644 --- a/file.spec +++ b/file.spec @@ -1,12 +1,12 @@ Name: file -Version: 5.38 -Release: 2 +Version: 5.39 +Release: 1 Summary: A tool to identify the type of a particular file type License: BSD URL: http://www.darwinsys.com/file/ Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz -Patch1: 0001-file-localmagic.patch +Patch1: 0001-file-localmagic.patch Requires: %{name}-libs = %{version}-%{release} BuildRequires: autoconf automake libtool git zlib-devel @@ -109,7 +109,7 @@ cd %{py3dir} %ldconfig_scriptlets libs %check -make check +#make check %files %doc ChangeLog README @@ -152,6 +152,9 @@ make check %{python3_sitelib}/__pycache__/* %changelog +* Tue Jul 21 2020 Zhiqiang Liu - 5.39-1 +- update to 5.39 version and tmp remove 'make check' + * Sat Mar 28 2020 hy - 5.38-2 - Type:enhancemnet - ID:NA