From fc4f96803d7ad9ef6ee034d6ca4190b21c47804b975bf0dbeeab8c3c5c2d245b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Oct 2013 10:43:52 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=82 --- file-5.12-nitpick.dif | 2 +- file-5.15-clear-invalid.patch | 25 +++++++++++++++++++++++++ file.changes | 19 +++++++++++++++++++ file.spec | 2 ++ python-magic.changes | 5 +++++ python-magic.spec | 2 +- 6 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 file-5.15-clear-invalid.patch diff --git a/file-5.12-nitpick.dif b/file-5.12-nitpick.dif index 30e6362..fcc0c0b 100644 --- a/file-5.12-nitpick.dif +++ b/file-5.12-nitpick.dif @@ -46,7 +46,7 @@ #ifdef S_IFLNK -OPT('L', "dereference", 0, " follow symlinks (default)\n") -OPT('h', "no-dereference", 0, " don't follow symlinks\n") -+OPT_POSIX('L', "dereference", 0, " follow symlinks (default)\n") ++OPT_POSIX('L', "dereference", 0, " follow symlinks\n") +OPT_POSIX('h', "no-dereference", 0, " don't follow symlinks\n") #endif OPT('n', "no-buffer", 0, " do not buffer output\n") diff --git a/file-5.15-clear-invalid.patch b/file-5.15-clear-invalid.patch new file mode 100644 index 0000000..95e71ec --- /dev/null +++ b/file-5.15-clear-invalid.patch @@ -0,0 +1,25 @@ +From: Andreas Stieger +Date: Sun, 29 Sep 2013 01:47:57 +0100 +Subject: [PATCH] remove clear instruction +Upstream: no +References: http://mx.gw.com/pipermail/file/2013/001227.html http://mx.gw.com/pipermail/file/2013/001225.html + +fixed build warning: +[ 205s] /usr/share/misc/magic, 5352: Warning: type `clear x' invalid + +--- + magic/Magdir/elf | 1 - + 1 file changed, 1 deletion(-) + +Index: file-5.15/magic/Magdir/elf +=================================================================== +--- file-5.15.orig/magic/Magdir/elf 2013-09-29 01:42:19.000000000 +0100 ++++ file-5.15/magic/Magdir/elf 2013-09-29 01:43:25.000000000 +0100 +@@ -30,7 +30,6 @@ + #>>>(0x38+0xcc) string >\0 of '%s' + #>>>(0x38+0x10) lelong >0 (signal %d), + >16 leshort &0xff00 processor-specific, +->18 clear x + >18 leshort 0 no machine, + >18 leshort 1 AT&T WE32100 + >18 leshort 2 SPARC diff --git a/file.changes b/file.changes index 77ad31b..4e18000 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 10:42:40 UTC 2013 - werner@suse.de + +- Add changes of Andreas Stieger + ------------------------------------------------------------------- Mon Sep 30 14:27:34 UTC 2013 - werner@suse.de @@ -14,6 +19,20 @@ Mon Sep 30 14:27:34 UTC 2013 - werner@suse.de which is too restrictive. Add a "clear" for that level keyword and make "default" void. * disallow strength setting in "name" entries +- Adjust for upstream changes: + * file-5.14-tex.dif + * file-5.07-elf.dif + * file-5.12-ocloexec.patch + * file-5.12-nitpick.dif + * file-5.13.dif +- Drop patches, applied upstream: + * file-5.13-whitespace.patch + * elf-invalid-byte-order.patch + +------------------------------------------------------------------- +Sun Sep 29 00:46:01 UTC 2013 - andreas.stieger@gmx.de + +- add file-5.15-clear-invalid.patch to fix an invalid format ------------------------------------------------------------------- Sun May 26 10:31:25 UTC 2013 - schwab@suse.de diff --git a/file.spec b/file.spec index c76339d..202af8b 100644 --- a/file.spec +++ b/file.spec @@ -60,6 +60,7 @@ Patch32: file-5.07-clicfs.dif Patch33: file-5.12-ocloexec.patch Patch34: file-5.12-endian.patch Patch35: file-5.12-nitpick.dif +Patch36: file-5.15-clear-invalid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -124,6 +125,7 @@ to develop applications that require the magic "file" interface. %patch33 -p0 -b .clexe %patch34 -p0 -b .endian %patch35 -p0 -b .nitpick +%patch36 -p1 -b .clear %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in diff --git a/python-magic.changes b/python-magic.changes index d11ee81..70644a4 100644 --- a/python-magic.changes +++ b/python-magic.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 10:43:20 UTC 2013 - werner@suse.de + +- Make if ready for file 5.15 + ------------------------------------------------------------------- Tue Mar 12 10:37:20 UTC 2013 - idonmez@suse.com diff --git a/python-magic.spec b/python-magic.spec index a5feec6..e933bf3 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -23,7 +23,7 @@ BuildRequires: libtool BuildRequires: python-devel BuildRequires: zlib-devel Url: http://www.darwinsys.com/file/ -Version: 5.14 +Version: 5.15 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause and BSD-4-Clause