From ae2cef80c6867b35eaf62c56e4a73da1a650d9eb Mon Sep 17 00:00:00 2001 From: Martin Bacovsky Date: Mon, 12 Mar 2007 12:19:54 +0000 Subject: [PATCH] - added patch to avoid __unused macro collision on ppc64 --- file-4.20-unused.patch | 28 ++++++++++++++++++++++++++++ file.spec | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 file-4.20-unused.patch diff --git a/file-4.20-unused.patch b/file-4.20-unused.patch new file mode 100644 index 0000000..2b89b6a --- /dev/null +++ b/file-4.20-unused.patch @@ -0,0 +1,28 @@ +--- file-4.20/src/file.c.unused 2007-03-12 13:13:17.000000000 +0100 ++++ file-4.20/src/file.c 2007-03-12 13:15:50.000000000 +0100 +@@ -358,7 +358,7 @@ + + private void + /*ARGSUSED*/ +-load(const char *m __unused, int flags) ++load(const char *m f__unused, int flags) + { + if (magic) + return; +--- file-4.20/src/file.h.unused 2007-03-12 13:12:32.000000000 +0100 ++++ file-4.20/src/file.h 2007-03-12 13:15:40.000000000 +0100 +@@ -79,11 +79,11 @@ + #endif + #endif + +-#ifndef __unused ++#ifndef f__unused + #if __GNUC_PREREQ__(2, 7) +-#define __unused __attribute__((__unused__)) ++#define f__unused __attribute__((__unused__)) + #else +-#define __unused /* delete */ ++#define f__unused /* delete */ + #endif + #endif + diff --git a/file.spec b/file.spec index bfbf332..c938324 100644 --- a/file.spec +++ b/file.spec @@ -22,6 +22,7 @@ Patch20: file-4.17-bash.patch Patch21: file-4.19-ELF.patch Patch22: file-4.19-ooffice.patch Patch23: file-4.20-REG_STARTEND.patch +Patch24: file-4.20-unused.patch Requires: file-libs = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,6 +71,7 @@ necessary for developing programs using libmagic. %patch21 -p1 -b .ELF %patch22 -p1 -b .ooffice %patch23 -p1 -b .REG_STARTEND +%patch24 -p1 -b .unused iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man