up to 5.41

- README didn't make it to dist tarball, will be back in next release
- drop xz patch (part of release now)

diff --git a/automake.patch b/automake.patch
index ac7fbdf1b9fa496191753769242904b42e4f063b..d06951bd99f283af1b319e0bd261369626755e09 100644 (file)
--- a/automake.patch
+++ b/automake.patch
@@ -7,7 +7,7 @@
 -pkgdata_DATA = magic.mgc
 +pkgdata_DATA = magic.mgc magic
  
- EXTRA_DIST = \
+ MAGIC_FRAGMENTS = \
  $(MAGIC_DIR)/Header \
  $(MAGIC_DIR)/Localstuff \
 +$(MAGIC_FILES)
@@ -24,13 +24,18 @@
  $(MAGIC_FRAGMENT_DIR)/msdos \
  $(MAGIC_FRAGMENT_DIR)/msooxml \
  $(MAGIC_FRAGMENT_DIR)/msvc \
-@@ -238,10 +242,12 @@
+@@ -238,15 +242,17 @@
  $(MAGIC_FRAGMENT_DIR)/zfs \
  $(MAGIC_FRAGMENT_DIR)/zilog \
 +$(MAGIC_FRAGMENT_DIR)/zisofs \
  $(MAGIC_FRAGMENT_DIR)/zip \
  $(MAGIC_FRAGMENT_DIR)/zyxel
  
+ EXTRA_DIST = \
+ $(MAGIC_DIR)/scripts/create_filemagic_flac \
+ $(MAGIC_FRAGMENTS)
+ 
+ 
 -MAGIC = magic.mgc
 -CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
 +MAGIC = magic
@@ -43,9 +48,9 @@
  FILE_COMPILE_DEP = $(FILE_COMPILE)
  endif
  
--${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
+-${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP)
 -      @rm -fr magic
--      @mkdir magic && cp -p $(EXTRA_DIST) magic
+-      @mkdir magic && cp -p $(MAGIC_FRAGMENTS) magic
 +$(MAGIC): $(MAGIC_DIR)/Header $(MAGIC_FILES)
 +      cat $(MAGIC_DIR)/Header $(MAGIC_FILES) > $@
 +

diff --git a/file.spec b/file.spec
index 24ddfed64a52971e2cb7b28e56f22c5753b99941..17a98cd0c0fb62007497b9adfa469e3c4b2edd4a 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -34,12 +34,12 @@ Summary(uk.UTF-8):  Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):  判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
-Version:       5.40
-Release:       3
+Version:       5.41
+Release:       1
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: 72540ea1cc8c6e1dee35d6100ec66589
+# Source0-md5: 18233bb0a0089dfdc7dfbc93b96f231b
 Source1:       http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:       %{name}-zisofs.magic
@@ -50,7 +50,6 @@ Patch1:               searchpath.patch
 Patch2:                automake.patch
 Patch3:                %{name}-gettext-no-random-translations.patch
 Patch4:                name-use-count.patch
-Patch5:                magic-xz.patch
 URL:           http://www.darwinsys.com/file/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -284,7 +283,6 @@ Wiązania Pythona 3 do biblioteki libmagic.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %if "%{_ver_lt '%{cc_version}' '3.4'}" == "1"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
@@ -377,7 +375,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog COPYING README
+%doc ChangeLog COPYING
 %attr(755,root,root) %{_bindir}/file
 %{_datadir}/file
 %{_datadir}/misc/magic

diff --git a/magic-xz.patch b/magic-xz.patch
deleted file mode 100644 (file)
index e4fed04..0000000
--- a/magic-xz.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 19 Apr 2021 17:01:45 +0000
-Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
-
----
- magic/Magdir/compress | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/magic/Magdir/compress b/magic/Magdir/compress
-index 64d11a736..41a65738f 100644
---- a/magic/Magdir/compress
-+++ b/magic/Magdir/compress
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
-+# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
- # compress:  file(1) magic for pure-compression formats (no archives)
- #
- # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
-@@ -265,14 +265,13 @@
- 
- # http://tukaani.org/xz/xz-file-format.txt
- 0     ustring         \xFD7zXZ\x00            XZ compressed data, checksum
-+!:strength * 2
-+!:mime        application/x-xz
- >7    byte&0xf        0x0                     NONE
- >7    byte&0xf        0x1                     CRC32
- >7    byte&0xf        0x4                     CRC64
- >7    byte&0xf        0xa                     SHA-256
- 
--!:strength * 2
--!:mime        application/x-xz
--
- # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
- 0     string          LRZI                    LRZIP compressed data
- >4    byte            x                       - version %d