The package rpms/python-PyMuPDF.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-PyMuPDF.git/commit/?id=581....
Change:
+%ifarch s390 s390x
Thanks.
Full change:
============
commit 581c721f9b75a7449f3eb6a99da22e8d6b88a3e5
Author: Michael J Gruber <mjg(a)fedoraproject.org>
Date: Thu May 11 16:49:38 2023 +0200
Reenable test suite where possible
There are unclarified test suite failures on some architectures which
apparantly do not affect overall functionality. Reenable the test-suite
to catch problems at least on other architectures.
diff --git a/0001-test_pixmap-adjust-to-turbojpeg.patch
b/0001-test_pixmap-adjust-to-turbojpeg.patch
new file mode 100644
index 0000000..1c653de
--- /dev/null
+++ b/0001-test_pixmap-adjust-to-turbojpeg.patch
@@ -0,0 +1,29 @@
+From 735ce0fb7bf1938ead530b7138499464c6127f96 Mon Sep 17 00:00:00 2001
+Message-ID:
<735ce0fb7bf1938ead530b7138499464c6127f96.1683816092.git.mjg(a)fedoraproject.org>
+From: Michael J Gruber <mjg(a)fedoraproject.org>
+Date: Thu, 11 May 2023 16:40:03 +0200
+Subject: [PATCH] test_pixmap: adjust to turbojpeg
+
+Apparantly, different jpeg libraries decode the test jpg differently.
+Adjust to turbojpeg's color count until upstream uses an invariant
+format.
+---
+ tests/test_pixmap.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_pixmap.py b/tests/test_pixmap.py
+index 889858b..420245e 100644
+--- a/tests/test_pixmap.py
++++ b/tests/test_pixmap.py
+@@ -91,7 +91,7 @@ def test_setalpha():
+
+ def test_color_count():
+ pm = fitz.Pixmap(imgfile)
+- assert pm.color_count() == 40624
++ assert pm.color_count() == 39912
+
+ def test_memoryview():
+ pm = fitz.Pixmap(imgfile)
+--
+2.40.1.683.g916cfae490
+
diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec
index cf2d5d8..745ffde 100644
--- a/python-PyMuPDF.spec
+++ b/python-PyMuPDF.spec
@@ -2,13 +2,14 @@
Name: python-%{pypi_name}
Version: 1.22.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Python binding for MuPDF - a lightweight PDF and XPS viewer
License: AGPL-3.0-or-later
URL:
https://github.com/pymupdf/PyMuPDF
Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
Patch0: 0001-fix-test_-font.patch
+Patch1: 0001-test_pixmap-adjust-to-turbojpeg.patch
BuildRequires: python3-devel
BuildRequires: python3-fonttools
@@ -69,8 +70,11 @@ rm -f %{buildroot}%{_prefix}/README.md
%check
# FIXME: Crashes with Aborted, corrupted double-linked list
+%ifarch s390 s390x
%pytest || :
-
+%else
+%pytest
+%endif
%files -n python3-%{pypi_name}
%license COPYING
@@ -81,6 +85,9 @@ rm -f %{buildroot}%{_prefix}/README.md
%doc docs_built/* README.md
%changelog
+* Thu May 11 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.3-2
+- Reenable test suite where possible
+
* Thu May 11 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.3-1
- Update to new upstream release 1.22.3 (rhbz#2186919)
commit bd9137a67f1300eaef8fbcf91c862276d4a2c16d
Author: Michael J Gruber <mjg(a)fedoraproject.org>
Date: Thu May 11 15:55:11 2023 +0200
Update to new upstream release 1.22.3 (rhbz#2186919)
diff --git a/.gitignore b/.gitignore
index d193388..a0c4a9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@
/PyMuPDF-1.22.0.tar.gz
/PyMuPDF-1.22.1.tar.gz
/PyMuPDF-1.22.2.tar.gz
+/PyMuPDF-1.22.3.tar.gz
diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec
index 6176da1..cf2d5d8 100644
--- a/python-PyMuPDF.spec
+++ b/python-PyMuPDF.spec
@@ -1,7 +1,7 @@
%global pypi_name PyMuPDF
Name: python-%{pypi_name}
-Version: 1.22.2
+Version: 1.22.3
Release: 1%{?dist}
Summary: Python binding for MuPDF - a lightweight PDF and XPS viewer
@@ -15,7 +15,7 @@ BuildRequires: python3-fonttools
BuildRequires: python3-pillow
BuildRequires: python3-pytest
BuildRequires: python3-sphinx
-BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: python3-furo
BuildRequires: rst2pdf
BuildRequires: gcc gcc-c++
BuildRequires: swig
@@ -81,6 +81,9 @@ rm -f %{buildroot}%{_prefix}/README.md
%doc docs_built/* README.md
%changelog
+* Thu May 11 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.3-1
+- Update to new upstream release 1.22.3 (rhbz#2186919)
+
* Fri Apr 28 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.2-1
- Update to new upstream release 1.22.2 (rhbz#2186919)
diff --git a/sources b/sources
index fa6ba7c..ae1696b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyMuPDF-1.22.2.tar.gz) =
09f8f6c06fdd1d2474abd43d4e6c80b1857da9f6c879c04a225a1f7844e22935ddbefcde3bae95bd73ad0acf8a8f0956ee86e9122c64d905bd28bd760b6e14b0
+SHA512 (PyMuPDF-1.22.3.tar.gz) =
7e08d20ffbe3c7d6fde099e9466ed8ac94edddcd996eca0fec003f6f09af7237ec7843a6e6cf2e71302e39cc0bd74a9d5eb3c84086fb5fc4406cd2024b191a40
commit c79841e037c673cfec6943df5cfe749c029e22cf
Author: Michael J Gruber <mjg(a)fedoraproject.org>
Date: Fri Apr 28 07:15:54 2023 +0200
Update to new upstream release 1.22.2 (rhbz#2186919)
diff --git a/.gitignore b/.gitignore
index 6387bad..d193388 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@
/PyMuPDF-1.21.1.tar.gz
/PyMuPDF-1.22.0.tar.gz
/PyMuPDF-1.22.1.tar.gz
+/PyMuPDF-1.22.2.tar.gz
diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec
index 1e8934f..6176da1 100644
--- a/python-PyMuPDF.spec
+++ b/python-PyMuPDF.spec
@@ -1,7 +1,7 @@
%global pypi_name PyMuPDF
Name: python-%{pypi_name}
-Version: 1.22.1
+Version: 1.22.2
Release: 1%{?dist}
Summary: Python binding for MuPDF - a lightweight PDF and XPS viewer
@@ -81,6 +81,9 @@ rm -f %{buildroot}%{_prefix}/README.md
%doc docs_built/* README.md
%changelog
+* Fri Apr 28 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.2-1
+- Update to new upstream release 1.22.2 (rhbz#2186919)
+
* Mon Apr 24 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.1-1
- Update to new upstream release 1.22.1 (rhbz#2186919)
- Minor bug fixes
diff --git a/sources b/sources
index 9734920..fa6ba7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyMuPDF-1.22.1.tar.gz) =
0c3289a4722fd6d8194bd3abbca352df851fbd15067fb433a3e921cfe0adf34f2b22bb39b46867ec5dae9380bfe263635bdb6d9e803f56764078339397201811
+SHA512 (PyMuPDF-1.22.2.tar.gz) =
09f8f6c06fdd1d2474abd43d4e6c80b1857da9f6c879c04a225a1f7844e22935ddbefcde3bae95bd73ad0acf8a8f0956ee86e9122c64d905bd28bd760b6e14b0
commit b120c5e76ae607f37b2ce37a04ceb1a8e35d0ed1
Author: Michael J Gruber <mjg(a)fedoraproject.org>
Date: Mon Apr 24 21:32:01 2023 +0200
Update to new upstream release 1.22.1 (rhbz#2186919)
diff --git a/.gitignore b/.gitignore
index 03c75f1..6387bad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@
/PyMuPDF-1.21.0.tar.gz
/PyMuPDF-1.21.1.tar.gz
/PyMuPDF-1.22.0.tar.gz
+/PyMuPDF-1.22.1.tar.gz
diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec
index 740959c..1e8934f 100644
--- a/python-PyMuPDF.spec
+++ b/python-PyMuPDF.spec
@@ -1,7 +1,7 @@
%global pypi_name PyMuPDF
Name: python-%{pypi_name}
-Version: 1.22.0
+Version: 1.22.1
Release: 1%{?dist}
Summary: Python binding for MuPDF - a lightweight PDF and XPS viewer
@@ -81,6 +81,10 @@ rm -f %{buildroot}%{_prefix}/README.md
%doc docs_built/* README.md
%changelog
+* Mon Apr 24 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.1-1
+- Update to new upstream release 1.22.1 (rhbz#2186919)
+- Minor bug fixes
+
* Sat Apr 15 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.0-1
- Update to new upstream release 1.22.0 (rhbz#2186919)
- Text extraction now includes glyphs that overlap with clip rect, not just those
contained entirely.
diff --git a/sources b/sources
index da29068..9734920 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyMuPDF-1.22.0.tar.gz) =
ea5a105d17c6bda6f87e13ca18db292396aaa7f0dd15f41bfc9aa40e97aab8e3dbb28db12f357b7a252af4d97151e1f851f143f4490df858ccdacdd08764fd7f
+SHA512 (PyMuPDF-1.22.1.tar.gz) =
0c3289a4722fd6d8194bd3abbca352df851fbd15067fb433a3e921cfe0adf34f2b22bb39b46867ec5dae9380bfe263635bdb6d9e803f56764078339397201811
commit 509ae8fbb9a82b8e79faec59f3fc28a95170af61
Author: Michael J Gruber <mjg(a)fedoraproject.org>
Date: Sat Apr 15 14:09:54 2023 +0200
Update to new upstream release 1.22.0 (rhbz#2186919)
diff --git a/.gitignore b/.gitignore
index f237bdd..03c75f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@
/PyMuPDF-1.20.2.tar.gz
/PyMuPDF-1.21.0.tar.gz
/PyMuPDF-1.21.1.tar.gz
+/PyMuPDF-1.22.0.tar.gz
diff --git a/0001-fix-FTBFS-against-system-mupdf.patch
b/0001-fix-FTBFS-against-system-mupdf.patch
deleted file mode 100644
index 5bc8ae8..0000000
--- a/0001-fix-FTBFS-against-system-mupdf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 99762987327a1de774b2180490c3f45db648883e Mon Sep 17 00:00:00 2001
-Message-Id:
<99762987327a1de774b2180490c3f45db648883e.1667948785.git.mjg(a)fedoraproject.org>
-From: Michael J Gruber <mjg(a)fedoraproject.org>
-Date: Wed, 9 Nov 2022 00:06:21 +0100
-Subject: [PATCH] fix FTBFS against system mupdf
-
-Signed-off-by: Michael J Gruber <mjg(a)fedoraproject.org>
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index d687d39..55be4fc 100644
---- a/setup.py
-+++ b/setup.py
-@@ -534,6 +534,7 @@ if ('-h' not in sys.argv and '--help' not in
sys.argv
- mupdf_local += '/'
- log( f'mupdf_local={mupdf_local!r}')
- unix_build_dir = None
-+ unix_build_type = None
-
- # Force clean build of MuPDF.
- #
---
-2.38.1.500.g6f45862117
-
diff --git a/0001-fix-test_-font.patch b/0001-fix-test_-font.patch
new file mode 100644
index 0000000..807d2c3
--- /dev/null
+++ b/0001-fix-test_-font.patch
@@ -0,0 +1,43 @@
+From 35b5f8489385ea84a5dc0300cd216feee9772415 Mon Sep 17 00:00:00 2001
+Message-ID:
<35b5f8489385ea84a5dc0300cd216feee9772415.1681574102.git.mjg(a)fedoraproject.org>
+From: Michael J Gruber <mjg(a)fedoraproject.org>
+Date: Sat, 15 Apr 2023 17:53:27 +0200
+Subject: [PATCH] fix test_*font
+
+Depending on build options and system, noto fonts may or may not be
+present. Thus font tests expecting them may fail for the wrong reason.
+
+Adjust the tests to use the fallback font instead.
+---
+ tests/test_general.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_general.py b/tests/test_general.py
+index 68da7fd..c5d45d3 100644
+--- a/tests/test_general.py
++++ b/tests/test_general.py
+@@ -121,9 +121,9 @@ def test_bug1971():
+ doc.close()
+
+ def test_default_font():
+- f = fitz.Font()
+- assert str(f) == "Font('Noto Serif Regular')"
+- assert repr(f) == "Font('Noto Serif Regular')"
++ f = fitz.Font(ordering=0)
++ assert str(f) == "Font('Droid Sans Fallback Regular')"
++ assert repr(f) == "Font('Droid Sans Fallback Regular')"
+
+ def test_add_ink_annot():
+ import math
+@@ -186,7 +186,7 @@ def test_get_text_dict():
+ json.dumps( blocks, indent=4)
+
+ def test_font():
+- font = fitz.Font()
++ font = fitz.Font(ordering=0)
+ print(repr(font))
+ bbox = font.glyph_bbox( 65)
+ print( f'bbox={bbox!r}')
+--
+2.40.0.414.g17ff5447bb
+
diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec
index bbbe05e..740959c 100644
--- a/python-PyMuPDF.spec
+++ b/python-PyMuPDF.spec
@@ -1,14 +1,14 @@
%global pypi_name PyMuPDF
Name: python-%{pypi_name}
-Version: 1.21.1
-Release: 6%{?dist}
+Version: 1.22.0
+Release: 1%{?dist}
Summary: Python binding for MuPDF - a lightweight PDF and XPS viewer
License: AGPL-3.0-or-later
URL:
https://github.com/pymupdf/PyMuPDF
Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
-Patch0: 0001-fix-FTBFS-against-system-mupdf.patch
+Patch0: 0001-fix-test_-font.patch
BuildRequires: python3-devel
BuildRequires: python3-fonttools
@@ -81,6 +81,11 @@ rm -f %{buildroot}%{_prefix}/README.md
%doc docs_built/* README.md
%changelog
+* Sat Apr 15 2023 Michael J Gruber <mjg(a)fedoraproject.org> - 1.22.0-1
+- Update to new upstream release 1.22.0 (rhbz#2186919)
+- Text extraction now includes glyphs that overlap with clip rect, not just those
contained entirely.
+- Compatibility with mupdf 1.22.0, various bug fixes.
+
* Thu Apr 06 2023 Sandro Mani <manisandro(a)gmail.com> - 1.21.1-6
- Rebuild (tesseract)
diff --git a/sources b/sources
index b1fd2b9..da29068 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyMuPDF-1.21.1.tar.gz) =
2c6917d055a1a964c954970ba60df8121d127c2127544ae3dfdb5f6c5c1c4e94d41a179490179ba9a88e5db8bc522d81dbea196a4f4ec46c348279c4bc50e8ba
+SHA512 (PyMuPDF-1.22.0.tar.gz) =
ea5a105d17c6bda6f87e13ca18db292396aaa7f0dd15f41bfc9aa40e97aab8e3dbb28db12f357b7a252af4d97151e1f851f143f4490df858ccdacdd08764fd7f
commit 5fa5a31569023a6338c1aa93bf7223e76470be9a
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Thu Apr 6 23:30:37 2023 +0200
Rebuild (tesseract)
diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec
index 6a3661b..bbbe05e 100644
--- a/python-PyMuPDF.spec
+++ b/python-PyMuPDF.spec
@@ -2,7 +2,7 @@
Name: python-%{pypi_name}
Version: 1.21.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Python binding for MuPDF - a lightweight PDF and XPS viewer
License: AGPL-3.0-or-later
@@ -81,6 +81,9 @@ rm -f %{buildroot}%{_prefix}/README.md
%doc docs_built/* README.md
%changelog
+* Thu Apr 06 2023 Sandro Mani <manisandro(a)gmail.com> - 1.21.1-6
+- Rebuild (tesseract)
+
* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.21.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
commit 66ff8d7fa5430801ee38b7889aa72c4032e0bec2
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 10:49:38 2023 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec
index f4eff39..6a3661b 100644
--- a/python-PyMuPDF.spec
+++ b/python-PyMuPDF.spec
@@ -2,7 +2,7 @@
Name: python-%{pypi_name}
Version: 1.21.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Python binding for MuPDF - a lightweight PDF and XPS viewer
License: AGPL-3.0-or-later
@@ -81,6 +81,9 @@ rm -f %{buildroot}%{_prefix}/README.md
%doc docs_built/* README.md
%changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.21.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
* Fri Dec 23 2022 Sandro Mani <manisandro(a)gmail.com> - 1.21.1-4
- Rebuild (tesseract)