rpms/file/devel file-4.20-unused.patch, NONE, 1.1 file.spec, 1.61, 1.62

[fedora-cvs-commits at redhat.com]

Author: mbacovsk

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18070

Modified Files:
	file.spec 
Added Files:
	file-4.20-unused.patch 
Log Message:
* Mon Mar 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 4.20-1
- added patch to avoid __unused macro collision on ppc64


file-4.20-unused.patch:
 file.c |    2 +-
 file.h |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE file-4.20-unused.patch ---
--- 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
 


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- file.spec	7 Mar 2007 11:02:56 -0000	1.61
+++ file.spec	12 Mar 2007 12:19:54 -0000	1.62
@@ -22,6 +22,7 @@
 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 @@
 %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