From d32ce90bfbbbc2551e472d5a915342f45303964eb5c647c48f3106c58dc64f7e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 12 Apr 2007 15:22:48 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=5

---
 file-4.20-unused.dif | 28 ++++++++++++++++++++++++++++
 file-4.20.dif        |  3 ++-
 file.changes         |  5 +++++
 file.spec            |  6 +++++-
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 file-4.20-unused.dif

diff --git a/file-4.20-unused.dif b/file-4.20-unused.dif
new file mode 100644
index 0000000..818199c
--- /dev/null
+++ b/file-4.20-unused.dif
@@ -0,0 +1,28 @@
+--- src/file.c
++++ src/file.c	2007-04-05 17:04:50.607194194 +0200
+@@ -358,7 +358,7 @@ main(int argc, char *argv[])
+ 
+ private void
+ /*ARGSUSED*/
+-load(const char *m __unused, int flags)
++load(const char *m __attr_unused__, int flags)
+ {
+ 	if (magic)
+ 		return;
+--- src/file.h
++++ src/file.h	2007-04-05 17:04:35.237181956 +0200
+@@ -79,11 +79,11 @@
+ #endif
+ #endif
+ 
+-#ifndef __unused
++#ifndef __attr_unused__
+ #if __GNUC_PREREQ__(2, 7)
+-#define	__unused	__attribute__((__unused__))
++#define	__attr_unused__	__attribute__((__unused__))
+ #else
+-#define	__unused	/* delete */
++#define	__attr_unused__	/* delete */
+ #endif
+ #endif
+ 
diff --git a/file-4.20.dif b/file-4.20.dif
index 320f379..d58de5b 100644
--- a/file-4.20.dif
+++ b/file-4.20.dif
@@ -1,6 +1,6 @@
 --- .pkgextract
 +++ .pkgextract	2006-03-27 13:29:19.000000000 +0200
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,12 @@
 +patch -p0 -s --suffix=.misc < ../file-4.18-misc.dif
 +patch -p0 -s --suffix=.pcp  < ../file-4.12-pcp.dif
 +patch -p0 -s --suffix=.exec < ../file-4.20-exec.dif
@@ -12,6 +12,7 @@
 +patch -p0 -s --suffix=.elf  < ../file-4.18-elf.dif
 +patch -p0 -s --suffix=.prtf < ../file-4.18-printf.dif
 +patch -p0 -s --suffix=.rse  < ../file-4.20-reg_startend.dif
++patch -p0 -s --suffix=.unsd < ../file-4.20-unused.dif
 --- magic/Header
 +++ magic/Header	2006-03-27 13:29:19.000000000 +0200
 @@ -1,5 +1,7 @@
diff --git a/file.changes b/file.changes
index b94b702..09eb917 100644
--- a/file.changes
+++ b/file.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr  5 17:09:05 CEST 2007 - werner@suse.de
+
+- Avoid trouble with variable/macro on ppc64
+
 -------------------------------------------------------------------
 Mon Mar 26 15:46:17 CEST 2007 - rguenther@suse.de
 
diff --git a/file.spec b/file.spec
index 5f13e73..2d8160d 100644
--- a/file.spec
+++ b/file.spec
@@ -17,7 +17,7 @@ License:        Other uncritical OpenSource License
 Group:          Productivity/File utilities
 Autoreqprov:    on
 Version:        4.20
-Release:        3
+Release:        6
 Summary:        A Tool to Determine File Types
 Source:         ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
 Patch:          file-%{version}.dif
@@ -32,6 +32,7 @@ Patch8:         file-4.20-xen.dif
 Patch9:         file-4.18-elf.dif
 Patch10:        file-4.18-printf.dif
 Patch11:        file-4.20-reg_startend.dif
+Patch12:        file-4.20-unused.dif
 Patch20:        file-4.16-mips.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -79,6 +80,7 @@ Authors:
 %patch9  -p0 -b .elf
 %patch10 -p0 -b .prtf
 %patch11 -p0 -b .rse
+%patch12 -p0 -b .unused
 %ifarch mips
 %patch20 -p0 -b .mips
 %endif
@@ -141,6 +143,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz
 
 %changelog
+* Thu Apr 05 2007 - werner@suse.de
+- Avoid trouble with variable/macro on ppc64
 * Mon Mar 26 2007 - rguenther@suse.de
 - Add zlib-devel BuildRequires
 * Wed Mar 21 2007 - werner@suse.de