diff --git a/0000-file-localmagic.patch b/0001-file-localmagic.patch similarity index 83% rename from 0000-file-localmagic.patch rename to 0001-file-localmagic.patch index d4f4e24..3144a80 100644 --- a/0000-file-localmagic.patch +++ b/0001-file-localmagic.patch @@ -1,4 +1,4 @@ -From f25107f625e88726e8ae9d4963573b5a0dda8f4c Mon Sep 17 00:00:00 2001 +From ab2220a8d4c1b52d12e9f3e0fa7a132e30849ee5 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 15 Dec 2011 16:15:41 +0100 Subject: [PATCH] file-localmagic.patch @@ -24,7 +24,7 @@ index 0000000..283a863 +# Insert here your local magic data. Format is described in magic(5). + diff --git a/src/Makefile.am b/src/Makefile.am -index 155aec4..0f22539 100644 +index 3f67f2c..b43cb8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ @@ -34,10 +34,10 @@ index 155aec4..0f22539 100644 nodist_include_HEADERS = magic.h diff --git a/src/Makefile.in b/src/Makefile.in -index b6eeb20..78dce55 100644 +index 59f3b5e..a8f56cf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -337,7 +337,7 @@ target_alias = @target_alias@ +@@ -356,7 +356,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -47,12 +47,12 @@ index b6eeb20..78dce55 100644 nodist_include_HEADERS = magic.h AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' diff --git a/src/apprentice.c b/src/apprentice.c -index e395854..ecc1214 100644 +index 1437bcc..b609dd1 100644 --- a/src/apprentice.c +++ b/src/apprentice.c -@@ -454,7 +454,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action) - if (map == RCAST(struct magic_map *, -1)) - return -1; +@@ -460,7 +460,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action) + #ifndef COMPILE_ONLY + map = apprentice_map(ms, fn); if (map == NULL) { - if (ms->flags & MAGIC_CHECK) + if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0) @@ -60,5 +60,5 @@ index e395854..ecc1214 100644 map = apprentice_load(ms, fn, action); if (map == NULL) -- -2.5.5 +1.8.3.1 diff --git a/file-5.38.tar.gz b/file-5.38.tar.gz deleted file mode 100644 index 249abc1..0000000 Binary files a/file-5.38.tar.gz and /dev/null differ diff --git a/file-5.39.tar.gz b/file-5.39.tar.gz new file mode 100644 index 0000000..92f9c6a Binary files /dev/null and b/file-5.39.tar.gz differ diff --git a/file.spec b/file.spec index dd2de01..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 -Patch0: 0000-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 @@ -129,6 +129,7 @@ make check %{_libdir}/*.so %{_libdir}/libmagic.a %{_includedir}/magic.h +%{_libdir}/pkgconfig/libmagic.pc %files help %{_mandir}/man* @@ -151,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