diff --git a/file-5.03-multilib.patch b/file-5.03-multilib.patch index 3c32ce7..3782dfe 100644 --- a/file-5.03-multilib.patch +++ b/file-5.03-multilib.patch @@ -1,10 +1,29 @@ diff -up file-5.03/magic/Makefile.am.multilib file-5.03/magic/Makefile.am ---- file-5.03/magic/Makefile.am.multilib 2009-08-25 12:45:46.000000000 +0200 -+++ file-5.03/magic/Makefile.am 2009-08-25 12:50:09.000000000 +0200 -@@ -234,5 +234,5 @@ FILE_COMPILE_DEP = $(FILE_COMPILE) +--- file-5.03/magic/Makefile.am.multilib 2009-11-30 11:38:18.000000000 +0100 ++++ file-5.03/magic/Makefile.am 2009-11-30 11:47:23.000000000 +0100 +@@ -234,5 +234,7 @@ FILE_COMPILE_DEP = $(FILE_COMPILE) endif ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) - $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR) -+ $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)/* - @mv $(MAGIC_FRAGMENT_BASE).mgc $@ +- @mv $(MAGIC_FRAGMENT_BASE).mgc $@ ++ cat $(MAGIC_FRAGMENT_DIR)/* > all-magic ++ $(FILE_COMPILE) -C -m all-magic ++ rm all-magic ++ @mv all-magic.mgc $@ +diff -up file-5.03/magic/Makefile.in.multilib file-5.03/magic/Makefile.in +--- file-5.03/magic/Makefile.in.multilib 2009-11-30 11:38:34.000000000 +0100 ++++ file-5.03/magic/Makefile.in 2009-11-30 11:48:28.000000000 +0100 +@@ -584,8 +584,10 @@ uninstall-am: uninstall-pkgdataDATA + + + ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) +- $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR) +- @mv $(MAGIC_FRAGMENT_BASE).mgc $@ ++ cat $(MAGIC_FRAGMENT_DIR)/* > all-magic ++ $(FILE_COMPILE) -C -m all-magic ++ rm all-magic ++ @mv all-magic.mgc $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/file.spec b/file.spec index 6869591..5e1b1c5 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.03 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -25,7 +25,6 @@ Patch10: file-5.03-delta.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel -BuildRequires: autoconf, automake %description The file command is used to identify a particular file according to the @@ -159,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 30 2009 Daniel Novotny 5.03-16 +- fixed the patch for multilib (#515767) + * Tue Nov 24 2009 Daniel Novotny 5.03-15 - BuildRequires: autoconf, automake