From 573f93ed1428fa4e820e8449f5d542d52e374d68dbf4da967c92c390a4eda6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 4 Jul 2019 12:09:43 +0000 Subject: [PATCH] - Update the patch magic-new-file.patch to work with newer file package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-magic?expand=0&rev=11 --- magic-new-file.patch | 18 +++++++++++------- python-python-magic.changes | 6 ++++++ python-python-magic.spec | 4 ++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/magic-new-file.patch b/magic-new-file.patch index c4e822b..3fc7753 100644 --- a/magic-new-file.patch +++ b/magic-new-file.patch @@ -49,14 +49,18 @@ Index: python-magic-0.4.15/test/test.py def test_from_buffer_str_and_bytes(self): m = magic.Magic(mime=True) -@@ -67,9 +68,11 @@ class MagicTest(unittest.TestCase): - ('gzip compressed data, was "test", from Unix, last ' - 'modified: Sun Jun 29 01:32:52 2008', - 'gzip compressed data, was "test", last modified' +@@ -64,12 +65,12 @@ class MagicTest(unittest.TestCase): + 'magic._pyc_': 'python 2.4 byte-compiled', + 'test.pdf': 'PDF document, version 1.2', + 'test.gz': +- ('gzip compressed data, was "test", from Unix, last ' +- 'modified: Sun Jun 29 01:32:52 2008', +- 'gzip compressed data, was "test", last modified' - ': Sun Jun 29 01:32:52 2008, from Unix'), -+ ': Sun Jun 29 01:32:52 2008, from Unix', -+ 'gzip compressed data, was "test", last modified' -+ ': Sun Jun 29 01:32:52 2008, from Unix, original size 15'), ++ ('gzip compressed data, was "test", from Unix, last modified: Sun Jun 29 01:32:52 2008', ++ 'gzip compressed data, was "test", last modified: Sun Jun 29 01:32:52 2008, from Unix', ++ 'gzip compressed data, was "test", last modified: Sun Jun 29 01:32:52 2008, from Unix, original size 15', ++ 'gzip compressed data, was "test", last modified: Sun Jun 29 01:32:52 2008, from Unix, original size modulo 2^32 15'), 'text.txt': 'ASCII text', - }) + }, buf_equals_file=False) diff --git a/python-python-magic.changes b/python-python-magic.changes index 4176232..6af38bb 100644 --- a/python-python-magic.changes +++ b/python-python-magic.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 4 12:09:23 UTC 2019 - Tomáš Chvátal + +- Update the patch magic-new-file.patch to work with newer file + package + ------------------------------------------------------------------- Tue Aug 21 10:31:23 UTC 2018 - tchvatal@suse.com diff --git a/python-python-magic.spec b/python-python-magic.spec index 7723c5a..69d60cf 100644 --- a/python-python-magic.spec +++ b/python-python-magic.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-magic # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ #