From 13385d792983d448b4eb8d29d5585ec19ab057972231f303961541b85796a03a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 08:55:24 +0000 Subject: [PATCH] Accepting request 24415 from Base:System Copy from Base:System/file based on submit request 24415 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/24415 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=32 --- file-4.03-tex.dif | 8 +++++--- file-4.24-autoconf.dif | 18 +++++++++++------- file.changes | 5 +++++ file.spec | 2 +- python-magic.spec | 2 +- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/file-4.03-tex.dif b/file-4.03-tex.dif index 3692ac8..d83758d 100644 --- a/file-4.03-tex.dif +++ b/file-4.03-tex.dif @@ -1,7 +1,9 @@ ---- magic/Localstuff -+++ magic/Localstuff Tue Jul 1 16:58:32 2003 +Index: magic/Localstuff +=================================================================== +--- magic/Localstuff.orig ++++ magic/Localstuff @@ -5,3 +5,12 @@ - # $Id: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ + # $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ # Add any locally observed files here. Remember: # text if readable, executable if runnable binary, data if unreadable. + diff --git a/file-4.24-autoconf.dif b/file-4.24-autoconf.dif index 8071faf..18f3406 100644 --- a/file-4.24-autoconf.dif +++ b/file-4.24-autoconf.dif @@ -1,5 +1,7 @@ ---- doc/Makefile.am -+++ doc/Makefile.am 2003-12-15 13:04:19.000000000 +0100 +Index: doc/Makefile.am +=================================================================== +--- doc/Makefile.am.orig ++++ doc/Makefile.am @@ -5,7 +5,8 @@ else man_MAGIC = magic.4 endif @@ -20,8 +22,10 @@ @rm -f $@ sed -e s@__CSECTION__@1@g \ -e s@__FSECTION__@${fsect}@g \ ---- src/readelf.h -+++ src/readelf.h 2003-07-01 16:53:55.000000000 +0200 +Index: src/readelf.h +=================================================================== +--- src/readelf.h.orig ++++ src/readelf.h @@ -34,7 +34,10 @@ #ifndef __fake_elf_h__ #define __fake_elf_h__ @@ -33,9 +37,9 @@ #include #endif -@@ -233,4 +236,5 @@ typedef struct { - #define GNU_OS_KFREEBSD 3 - #define GNU_OS_KNETBSD 4 +@@ -309,4 +312,5 @@ typedef struct { + #define AV_386_SSE4_1 0x00800000 + #define AV_386_SSE4_2 0x01000000 +__END_DECLS #endif diff --git a/file.changes b/file.changes index e8d27a6..c94b1ad 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:12:13 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Tue Oct 27 17:04:51 CET 2009 - werner@suse.de diff --git a/file.spec b/file.spec index 9ecb06b..8c2301f 100644 --- a/file.spec +++ b/file.spec @@ -31,7 +31,7 @@ Obsoletes: file-64bit # # Set Version also in python-magic.spec Version: 5.03 -Release: 2 +Release: 3 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif diff --git a/python-magic.spec b/python-magic.spec index 4b5afe1..c7de9a4 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -27,7 +27,7 @@ License: BSD 3 Clause, BSD 4 Clause Group: Development/Languages/Python AutoReqProv: on Version: 5.03 -Release: 2 +Release: 3 Summary: Python module to use libmagic %py_requires Source99: file.spec