Accepting request 316705 from Base:System
- Update to file version 5.24 * redo long option encoding to fix off-by-one in 5.23 - Adapt and rename patch file-5.12-nitpick.dif becomes file-5.24-nitpick.dif - adapt version in specfile to 5.24 OBS-URL: https://build.opensuse.org/request/show/316705 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=90
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
a84aa099dc
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2c8ab3ff143e2cdfb5ecee381752f80a79e0b4cfe9ca4cc6e1c3e5ec15e6157c
|
||||
size 737618
|
||||
@ -1,19 +1,24 @@
|
||||
---
|
||||
src/file.c | 8 ++++++++
|
||||
src/file_opts.h | 4 ++--
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
--- src/file.c
|
||||
+++ src/file.c 2013-09-30 00:00:00.000000000 +0000
|
||||
@@ -94,10 +94,12 @@ private const char *separator = ":"; /*
|
||||
private const struct option long_options[] = {
|
||||
+++ src/file.c 2015-07-14 11:45:26.449520700 +0000
|
||||
@@ -96,10 +96,12 @@ private const struct option long_options
|
||||
#define OPT_MIME_ENCODING 5
|
||||
#define OPT(shortname, longname, opt, doc) \
|
||||
{longname, opt, NULL, shortname},
|
||||
+#define OPT_POSIX OPT
|
||||
#define OPT_LONGONLY(longname, opt, doc) \
|
||||
{longname, opt, NULL, 0},
|
||||
+#define OPT_POSIX OPT
|
||||
#define OPT_LONGONLY(longname, opt, doc, id) \
|
||||
{longname, opt, NULL, id},
|
||||
#include "file_opts.h"
|
||||
#undef OPT
|
||||
+#undef OPT_POSIX
|
||||
#undef OPT_LONGONLY
|
||||
{0, 0, NULL, 0}
|
||||
};
|
||||
@@ -525,6 +527,7 @@ docprint(const char *opts)
|
||||
@@ -595,6 +597,7 @@ docprint(const char *opts)
|
||||
private void
|
||||
help(void)
|
||||
{
|
||||
@ -21,7 +26,7 @@
|
||||
(void)fputs(
|
||||
"Usage: file [OPTION...] [FILE...]\n"
|
||||
"Determine type of FILEs.\n"
|
||||
@@ -532,11 +535,16 @@ help(void)
|
||||
@@ -602,11 +605,16 @@ help(void)
|
||||
#define OPT(shortname, longname, opt, doc) \
|
||||
fprintf(stdout, " -%c, --" longname, shortname), \
|
||||
docprint(doc);
|
||||
@ -29,7 +34,7 @@
|
||||
+ fprintf(stdout, " -%c, --" longname "%s", shortname, \
|
||||
+ (shortname == 'L') ? (posix ? " (default)" : "") : (posix ? "" : " (default)")), \
|
||||
+ docprint(doc);
|
||||
#define OPT_LONGONLY(longname, opt, doc) \
|
||||
#define OPT_LONGONLY(longname, opt, doc, id) \
|
||||
fprintf(stdout, " --" longname), \
|
||||
docprint(doc);
|
||||
#include "file_opts.h"
|
||||
@ -40,7 +45,7 @@
|
||||
exit(0);
|
||||
--- src/file_opts.h
|
||||
+++ src/file_opts.h 2013-09-30 13:44:17.000000000 +0000
|
||||
@@ -34,8 +34,8 @@ OPT_LONGONLY("mime-encoding", 0, "
|
||||
@@ -36,8 +36,8 @@ OPT_LONGONLY("mime-encoding", 0, "
|
||||
OPT('k', "keep-going", 0, " don't stop at the first match\n")
|
||||
OPT('l', "list", 0, " list magic strength\n")
|
||||
#ifdef S_IFLNK
|
||||
3
file-5.24.tar.gz
Normal file
3
file-5.24.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:802cb3de2e49e88ef97cdcb52cd507a0f25458112752e398445cea102bc750ce
|
||||
size 737911
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 14 11:48:47 UTC 2015 - werner@suse.de
|
||||
|
||||
- Update to file version 5.24
|
||||
* redo long option encoding to fix off-by-one in 5.23
|
||||
- Adapt and rename patch
|
||||
file-5.12-nitpick.dif becomes file-5.24-nitpick.dif
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 11 15:14:32 UTC 2015 - werner@suse.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package file
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -30,7 +30,7 @@ Obsoletes: file-64bit
|
||||
%endif
|
||||
#
|
||||
# Set Version also in python-magic.spec
|
||||
Version: 5.23
|
||||
Version: 5.24
|
||||
Release: 0
|
||||
Summary: A Tool to Determine File Types
|
||||
License: BSD-2-Clause
|
||||
@ -59,7 +59,7 @@ Patch31: file-5.19-biorad.dif
|
||||
Patch32: file-5.19-clicfs.dif
|
||||
Patch33: file-5.16-ocloexec.patch
|
||||
Patch34: file-5.23-endian.patch
|
||||
Patch35: file-5.12-nitpick.dif
|
||||
Patch35: file-5.24-nitpick.dif
|
||||
Patch36: file-5.15-clear-invalid.patch
|
||||
Patch37: file-secure_getenv.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 14 14:16:29 UTC 2015 - werner@suse.de
|
||||
|
||||
- adapt version in specfile to 5.24
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 11 15:15:34 UTC 2015 - werner@suse.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-magic
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -23,7 +23,7 @@ BuildRequires: libtool
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: zlib-devel
|
||||
Url: http://www.darwinsys.com/file/
|
||||
Version: 5.23
|
||||
Version: 5.24
|
||||
Release: 0
|
||||
Summary: Python module to use libmagic
|
||||
License: BSD-3-Clause and BSD-4-Clause
|
||||
|
||||
Loading…
Reference in New Issue
Block a user