Hello community, here is the log from the commit of package file checked in at Thu Apr 12 17:22:47 CEST 2007. -------- --- file/file.changes 2007-03-26 15:46:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file.changes 2007-04-12 12:33:50.848980000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 5 17:09:05 CEST 2007 - werner@suse.de + +- Avoid trouble with variable/macro on ppc64 + +------------------------------------------------------------------- New: ---- file-4.20-unused.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.S31463/_old 2007-04-12 17:19:52.000000000 +0200 +++ /var/tmp/diff_new_pack.S31463/_new 2007-04-12 17:19:52.000000000 +0200 @@ -17,7 +17,7 @@ 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 @@ 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 @@ %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 @@ %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 ++++++ file-4.20.dif ++++++ --- /var/tmp/diff_new_pack.S31463/_old 2007-04-12 17:19:52.000000000 +0200 +++ /var/tmp/diff_new_pack.S31463/_new 2007-04-12 17:19:52.000000000 +0200 @@ -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 @@ ++++++ file-4.20-unused.dif ++++++ --- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org