rpms/file/F-12 file-5.03-multilib.patch, 1.1, 1.2 file.spec, 1.108, 1.109

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/file/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23127

Modified Files:
	file-5.03-multilib.patch file.spec 
Log Message:
- fix the patch for multilib (#515767) in Makefile.in


file-5.03-multilib.patch:
 Makefile.am |    6 ++++--
 Makefile.in |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

Index: file-5.03-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/file/F-12/file-5.03-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- file-5.03-multilib.patch	25 Aug 2009 11:11:05 -0000	1.1
+++ file-5.03-multilib.patch	30 Nov 2009 11:13:25 -0000	1.2
@@ -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:


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/F-12/file.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- file.spec	24 Nov 2009 14:13:52 -0000	1.108
+++ file.spec	30 Nov 2009 11:13:25 -0000	1.109
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -21,7 +21,6 @@ Patch6: file-5.03-multilib.patch
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel
-BuildRequires: automake
 
 %description
 The file command is used to identify a particular file according to the
@@ -147,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Nov 30 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-12
+- fix the patch for multilib (#515767) in Makefile.in
+
 * Tue Nov 24 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-11
 - BuildRequires automake because of the Makefile.am patch