rpms/file/devel file-5.03-multilib.patch, NONE, 1.1 file.spec, 1.105, 1.106
Daniel Novotny
dnovotny at fedoraproject.org
Tue Aug 25 11:11:05 UTC 2009
Author: dnovotny
Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14419
Modified Files:
file.spec
Added Files:
file-5.03-multilib.patch
Log Message:
fix multilib bug (#515767)
file-5.03-multilib.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE file-5.03-multilib.patch ---
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 $@
Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- file.spec 6 Aug 2009 09:55:02 -0000 1.105
+++ file.spec 25 Aug 2009 11:11:05 -0000 1.106
@@ -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 <dnovotny at redhat.com> 5.03-9
+- fix #515767 - multilib: file /usr/share/misc/magic.mgc conflicts
+
* Thu Aug 06 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-8
- rebuild for #515767 - multilib: file /usr/share/misc/magic.mgc conflicts
More information about the scm-commits
mailing list