Sync from SUSE:SLFO:Main python-python-magic revision 432b61441fe4a7cfe0226ff351f86f69

This commit is contained in:
Adrian Schröter 2024-12-13 12:15:38 +01:00
parent 1564a865d6
commit 06647f4b8e
3 changed files with 34 additions and 0 deletions

27
magic-file-5.45.patch Normal file
View File

@ -0,0 +1,27 @@
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)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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>

View File

@ -28,6 +28,7 @@ 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}