rpm/file
SHA256
1
0
Fork 0
forked from pool/file
Code Pull Requests Activity

Accepting request 568099 from Base:System

Browse Source 
- Add patch file-5.32-ncurses-6.1.patch to support extend magic
  format for new ncurses 6.1

OBS-URL: https://build.opensuse.org/request/show/568099
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=105
This commit is contained in:
Dominique Leuenberger 2018-01-26 12:34:01 +00:00 committed by Git OBS Bridge
commit 1558f648bc
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
file-5.32-ncurses-6.1.patch Normal file
View File

@ -0,0 +1,24 @@
---
magic/Magdir/terminfo | 11 +++++++++++
1 file changed, 11 insertions(+)
--- magic/Magdir/terminfo
+++ magic/Magdir/terminfo 2018-01-22 10:32:38.596762352 +0000
@@ -19,6 +19,17 @@
# no extension
#!:ext
#
+#------------------------------------------------------------------------------
+# The following was added for ncurses6 development:
+#------------------------------------------------------------------------------
+#
+0 string \036\002
+# imitate the legacy compiled-format, to get the entry-name printed
+>16 ubyte >32
+# namelist, if more than 1 separated by "|" like "st|stterm| simpleterm 0.4.1"
+>>12 regex \^[a-zA-Z0-9][a-zA-Z0-9.][^|]* Compiled 32-bit terminfo entry "%-s"
+!:mime application/x-terminfo2
+#
# While the compiled terminfo uses little-endian format irregardless of
# platform, SystemV screen dumps do not. They came later, and that detail was
# overlooked.

6
file.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 22 10:37:39 UTC 2018 - werner@suse.de
- Add patch file-5.32-ncurses-6.1.patch to support extend magic
format for new ncurses 6.1
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 8 00:06:58 UTC 2017 - jengelh@inai.de Sun Oct 8 00:06:58 UTC 2017 - jengelh@inai.de

4
file.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package file # spec file for package file
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -62,6 +62,7 @@ Patch35: file-5.24-nitpick.dif
Patch36: file-5.15-clear-invalid.patch Patch36: file-5.15-clear-invalid.patch
Patch37: file-secure_getenv.patch Patch37: file-secure_getenv.patch
Patch39: file-5.28-btrfs-image.dif Patch39: file-5.28-btrfs-image.dif
Patch40: file-5.32-ncurses-6.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc %global _sysconfdir /etc
%global _miscdir %{_datadir}/misc %global _miscdir %{_datadir}/misc
@ -130,6 +131,7 @@ to develop applications that require the magic "file" interface.
%patch36 -p1 -b .clear %patch36 -p1 -b .clear
%patch37 -p1 -b .getenv %patch37 -p1 -b .getenv
%patch39 -p1 -b .btrfs %patch39 -p1 -b .btrfs
%patch40 -p0 -b .nc61
%patch -b .0 %patch -b .0
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
rm -fv src/magic.h rm -fv src/magic.h

2
python-magic.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python-magic # spec file for package python-magic
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed