diff --git a/file-5.03-multilib.patch b/file-5.03-multilib.patch new file mode 100644 index 0000000..3c32ce7 --- /dev/null +++ b/file-5.03-multilib.patch @@ -0,0 +1,10 @@ +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) + 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 $@ diff --git a/file.spec b/file.spec index 4dc6bb9..dca5367 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.03 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -16,6 +16,7 @@ Patch2: file-5.00-mdmp.patch Patch3: file-5.03-fonts-postscript.patch Patch4: file-5.03-xfsdump.patch Patch5: file-5.03-ifany.patch +Patch6: file-5.03-multilib.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +70,8 @@ file(1) command. %patch4 -p1 #fixes #510429 %patch5 -p1 +#fixes #515767 +%patch6 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -143,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Aug 25 2009 Daniel Novotny 5.03-9 +- fix #515767 - multilib: file /usr/share/misc/magic.mgc conflicts + * Thu Aug 06 2009 Daniel Novotny 5.03-8 - rebuild for #515767 - multilib: file /usr/share/misc/magic.mgc conflicts