- rediffed automake,searchpath patches with fuzz 0

diff --git a/automake.patch b/automake.patch
index 87889e7c7a5d9cb298d340f6ebef6e274665f92f..ac7fbdf1b9fa496191753769242904b42e4f063b 100644 (file)
--- a/automake.patch
+++ b/automake.patch
@@ -16,14 +16,14 @@
  $(MAGIC_FRAGMENT_DIR)/acorn \
  $(MAGIC_FRAGMENT_DIR)/adi \
  $(MAGIC_FRAGMENT_DIR)/adventure \
-@@ -135,6 +138,7 @@
- $(MAGIC_FRAGMENT_DIR)/modem \
+@@ -189,6 +189,7 @@
+ $(MAGIC_FRAGMENT_DIR)/modulefile \
  $(MAGIC_FRAGMENT_DIR)/motorola \
  $(MAGIC_FRAGMENT_DIR)/mozilla \
 +$(MAGIC_FRAGMENT_DIR)/mscompress \
  $(MAGIC_FRAGMENT_DIR)/msdos \
  $(MAGIC_FRAGMENT_DIR)/msooxml \
- $(MAGIC_FRAGMENT_DIR)/msx \
+ $(MAGIC_FRAGMENT_DIR)/msvc \
 @@ -238,10 +242,12 @@
  $(MAGIC_FRAGMENT_DIR)/zfs \
  $(MAGIC_FRAGMENT_DIR)/zilog \

diff --git a/file.spec b/file.spec
index ce81b82c030760b4cd5a134d608990dfa1044ea4..dd811f8a666f52ba92139747916557a9b3aac1f2 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -292,8 +292,8 @@ cp -a python py3
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 %ifnarch %{x8664}

diff --git a/searchpath.patch b/searchpath.patch
index 5382e38b130267e7d3546523a09aec3c49190fd6..649c6cbfd9eb8aa2731206b62820082b98f572cd 100644 (file)
--- a/searchpath.patch
+++ b/searchpath.patch
@@ -1,8 +1,8 @@
 still search in /etc/magic
 still use ~/.magic by default
 
---- file-5.12/src/Makefile.am.orig     2013-01-05 18:06:28.459521884 +0100
-+++ file-5.12/src/Makefile.am  2013-01-05 18:07:08.582854382 +0100
+--- file-5.39/src/Makefile.am.orig     2020-11-03 18:58:10.356256020 +0100
++++ file-5.39/src/Makefile.am  2020-11-03 18:58:16.536576455 +0100
 @@ -4,7 +4,7 @@
  
  bin_PROGRAMS = file
@@ -11,7 +11,7 @@ still use ~/.magic by default
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
+ libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
 --- file-5.06/src/magic.c~     2011-04-07 22:20:30.000000000 +0300
 +++ file-5.06/src/magic.c      2011-04-18 11:56:38.611292743 +0300
 @@ -107,7 +107,7 @@