From c20bbb84e8e39559a59cd28d3204d2bf99ec45fcae38feb65228503da804d6b8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 10 Mar 2021 13:44:25 +0000 Subject: [PATCH] Drop file-5.12-zip.dif OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=220 --- file-5.12-zip.dif | 32 -------------------------------- file.changes | 5 +++++ file.spec | 4 +--- python-magic.spec | 2 +- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 file-5.12-zip.dif diff --git a/file-5.12-zip.dif b/file-5.12-zip.dif deleted file mode 100644 index cab2d1d..0000000 --- a/file-5.12-zip.dif +++ /dev/null @@ -1,32 +0,0 @@ ---- - magic/Magdir/archive | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - ---- magic/Magdir/archive -+++ magic/Magdir/archive 2019-05-27 08:45:06.163107524 +0000 -@@ -1110,6 +1110,25 @@ - !:strength +1 - 0 string PK\003\004 - !:strength +1 -+>30 ubelong !0x6d696d65 -+>>4 byte 0x00 Zip archive data -+!:mime application/zip -+!:ext zip/cbz -+>>4 byte 0x09 Zip archive data, at least v0.9 to extract -+!:mime application/zip -+!:ext zip/cbz -+>>4 byte 0x0a Zip archive data, at least v1.0 to extract -+!:mime application/zip -+!:ext zip/cbz -+>>4 byte 0x0b Zip archive data, at least v1.1 to extract -+!:mime application/zip -+!:ext zip/cbz -+>>0x161 string WINZIP Zip archive data, WinZIP self-extracting -+!:mime application/zip -+!:ext zip/cbz -+>>4 byte 0x14 Zip archive data, at least v2.0 to extract -+!:mime application/zip -+!:ext zip/cbz - - # Specialised zip formats which start with a member named 'mimetype' - # (stored uncompressed, with no 'extra field') containing the file's MIME type. diff --git a/file.changes b/file.changes index 01e5286..6f1e979 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 10 13:41:42 UTC 2021 - Dr. Werner Fink + +- Remove patch file-5.12-zip.dif as it is upstream solved (boo#1183143) + ------------------------------------------------------------------- Wed Jul 1 07:52:11 UTC 2020 - Dr. Werner Fink diff --git a/file.spec b/file.spec index 3799608..366c83f 100644 --- a/file.spec +++ b/file.spec @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -51,7 +51,6 @@ Patch7: file-4.20-ssd.dif Patch8: file-4.20-xen.dif Patch9: file-5.22-elf.dif Patch10: file-5.19-printf.dif -Patch11: file-5.12-zip.dif Patch12: file-5.17-option.dif Patch13: file-4.21-scribus.dif Patch15: file-4.21-xcursor.dif @@ -117,7 +116,6 @@ to develop applications that require the magic "file" interface. %patch8 -p0 -b .xen %patch9 -p0 -b .elf %patch10 -p0 -b .prtf -%patch11 -p0 -b .zip %patch12 -p1 -b .opt %patch13 -p0 -b .scri %patch15 -p0 -b .xcur diff --git a/python-magic.spec b/python-magic.spec index b4097c6..7f015cc 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed