This commit is contained in:
parent
ab6173859d
commit
d32ce90bfb
28
file-4.20-unused.dif
Normal file
28
file-4.20-unused.dif
Normal file
@ -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
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
--- .pkgextract
|
--- .pkgextract
|
||||||
+++ .pkgextract 2006-03-27 13:29:19.000000000 +0200
|
+++ .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=.misc < ../file-4.18-misc.dif
|
||||||
+patch -p0 -s --suffix=.pcp < ../file-4.12-pcp.dif
|
+patch -p0 -s --suffix=.pcp < ../file-4.12-pcp.dif
|
||||||
+patch -p0 -s --suffix=.exec < ../file-4.20-exec.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=.elf < ../file-4.18-elf.dif
|
||||||
+patch -p0 -s --suffix=.prtf < ../file-4.18-printf.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=.rse < ../file-4.20-reg_startend.dif
|
||||||
|
+patch -p0 -s --suffix=.unsd < ../file-4.20-unused.dif
|
||||||
--- magic/Header
|
--- magic/Header
|
||||||
+++ magic/Header 2006-03-27 13:29:19.000000000 +0200
|
+++ magic/Header 2006-03-27 13:29:19.000000000 +0200
|
||||||
@@ -1,5 +1,7 @@
|
@@ -1,5 +1,7 @@
|
||||||
|
@ -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
|
Mon Mar 26 15:46:17 CEST 2007 - rguenther@suse.de
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ License: Other uncritical OpenSource License
|
|||||||
Group: Productivity/File utilities
|
Group: Productivity/File utilities
|
||||||
Autoreqprov: on
|
Autoreqprov: on
|
||||||
Version: 4.20
|
Version: 4.20
|
||||||
Release: 3
|
Release: 6
|
||||||
Summary: A Tool to Determine File Types
|
Summary: A Tool to Determine File Types
|
||||||
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
|
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
|
||||||
Patch: file-%{version}.dif
|
Patch: file-%{version}.dif
|
||||||
@ -32,6 +32,7 @@ Patch8: file-4.20-xen.dif
|
|||||||
Patch9: file-4.18-elf.dif
|
Patch9: file-4.18-elf.dif
|
||||||
Patch10: file-4.18-printf.dif
|
Patch10: file-4.18-printf.dif
|
||||||
Patch11: file-4.20-reg_startend.dif
|
Patch11: file-4.20-reg_startend.dif
|
||||||
|
Patch12: file-4.20-unused.dif
|
||||||
Patch20: file-4.16-mips.dif
|
Patch20: file-4.16-mips.dif
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
@ -79,6 +80,7 @@ Authors:
|
|||||||
%patch9 -p0 -b .elf
|
%patch9 -p0 -b .elf
|
||||||
%patch10 -p0 -b .prtf
|
%patch10 -p0 -b .prtf
|
||||||
%patch11 -p0 -b .rse
|
%patch11 -p0 -b .rse
|
||||||
|
%patch12 -p0 -b .unused
|
||||||
%ifarch mips
|
%ifarch mips
|
||||||
%patch20 -p0 -b .mips
|
%patch20 -p0 -b .mips
|
||||||
%endif
|
%endif
|
||||||
@ -141,6 +143,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%attr(644,root,root) %{_mandir}/man3/libmagic.3.gz
|
%attr(644,root,root) %{_mandir}/man3/libmagic.3.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 05 2007 - werner@suse.de
|
||||||
|
- Avoid trouble with variable/macro on ppc64
|
||||||
* Mon Mar 26 2007 - rguenther@suse.de
|
* Mon Mar 26 2007 - rguenther@suse.de
|
||||||
- Add zlib-devel BuildRequires
|
- Add zlib-devel BuildRequires
|
||||||
* Wed Mar 21 2007 - werner@suse.de
|
* Wed Mar 21 2007 - werner@suse.de
|
||||||
|
Loading…
Reference in New Issue
Block a user