Sync from SUSE:SLFO:1.1 python-python-magic revision abb1fa11d5bf4bbcdd497d51a114891d

magic-file-5.45.patch

@@ -1,27 +0,0 @@
-Index: python-magic-0.4.27/test/python_magic_test.py
-===================================================================
---- python-magic-0.4.27.orig/test/python_magic_test.py
-+++ python-magic-0.4.27/test/python_magic_test.py
-@@ -108,7 +108,8 @@ class MagicTest(unittest.TestCase):
-             self.assert_values(m, {
-                 'magic._pyc_': 'python 2.4 byte-compiled',
-                 'test.pdf': ('PDF document, version 1.2',
--                             'PDF document, version 1.2, 2 pages'),
-+                             'PDF document, version 1.2, 2 pages',
-+                             'PDF document, version 1.2, 2 page(s)'),
-                 'test.gz':
-                     ('gzip compressed data, was "test", from Unix, last '
-                      'modified: Sun Jun 29 01:32:52 2008',
-Index: python-magic-0.4.27/test/libmagic_test.py
-===================================================================
---- python-magic-0.4.27.orig/test/libmagic_test.py
-+++ python-magic-0.4.27/test/libmagic_test.py
-@@ -15,7 +15,7 @@ class MagicTestCase(unittest.TestCase):
-     filename = os.path.join(TESTDATA_DIR, 'test.pdf')
-     expected_mime_type = 'application/pdf'
-     expected_encoding = 'us-ascii'
--    expected_name = ('PDF document, version 1.2', 'PDF document, version 1.2, 2 pages')
-+    expected_name = ('PDF document, version 1.2', 'PDF document, version 1.2, 2 pages', 'PDF document, version 1.2, 2 page(s)')
- 
-     def assert_result(self, result):
-         self.assertEqual(result.mime_type, self.expected_mime_type)

python-python-magic.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Wed Aug  2 09:28:03 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Add magic-file-5.45.patch: fix test suite with file 5.45
-  (gh#ahupp/python-magic#290).
-
 -------------------------------------------------------------------
 Fri Apr 21 12:32:16 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

python-python-magic.spec

@@ -28,7 +28,6 @@ Group:          Development/Languages/Python
 URL:            https://github.com/ahupp/python-magic
 Source:         https://github.com/ahupp/python-magic/archive/%{version}.tar.gz
 Patch0:         https://github.com/ahupp/python-magic/commit/4ffcd591.patch
-Patch1:         magic-file-5.45.patch
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module xml}