From e521d05d94d1006bd075abaf27c85e6b3d451ba6 Mon Sep 17 00:00:00 2001
From: Michael J Gruber <mjg@fedoraproject.org>
Date: Oct 09 2020 08:26:40 +0000
Subject: Update to new upstream release 1.18.0


---

diff --git a/.gitignore b/.gitignore
index 58880ea..2517c1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@
 /PyMuPDF-1.17.2.tar.gz
 /PyMuPDF-1.17.3.tar.gz
 /PyMuPDF-1.17.4.tar.gz
+/PyMuPDF-1.18.0.tar.gz
diff --git a/0001-build-against-system-gumbo-library-on-Fedora.patch b/0001-build-against-system-gumbo-library-on-Fedora.patch
new file mode 100644
index 0000000..56be42b
--- /dev/null
+++ b/0001-build-against-system-gumbo-library-on-Fedora.patch
@@ -0,0 +1,27 @@
+From cab3826e2bac521ab331f298b2b15afdfedf6570 Mon Sep 17 00:00:00 2001
+Message-Id: <cab3826e2bac521ab331f298b2b15afdfedf6570.1602231804.git.mjg@fedoraproject.org>
+From: Michael J Gruber <mjg@fedoraproject.org>
+Date: Fri, 9 Oct 2020 10:22:58 +0200
+Subject: [PATCH] build against system gumbo library on Fedora
+
+Signed-off-by: Michael J Gruber <mjg@fedoraproject.org>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 8b432b2..3753fb1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -14,7 +14,7 @@ class build_ext_first(build_py_orig):
+ DEFAULT = ["mupdf", "mupdf-third"]
+ ARCH_LINUX = DEFAULT + ["jbig2dec", "openjp2", "jpeg", "freetype"]
+ OPENSUSE = ARCH_LINUX + ["harfbuzz", "png16"]
+-FEDORA = ARCH_LINUX + ["harfbuzz"]
++FEDORA = ARCH_LINUX + ["harfbuzz", "gumbo"]
+ LIBRARIES = {
+     "default": DEFAULT,
+     "arch": ARCH_LINUX,
+-- 
+2.28.0.945.gedc4c61efd
+
diff --git a/fix-library-linking.patch b/fix-library-linking.patch
deleted file mode 100644
index 0a52d06..0000000
--- a/fix-library-linking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up PyMuPDF-1.14.9/setup.py.orig PyMuPDF-1.14.9/setup.py
---- PyMuPDF-1.14.9/setup.py.orig	2019-03-06 18:27:45.000000000 -0500
-+++ PyMuPDF-1.14.9/setup.py	2019-03-07 22:35:29.181201907 -0500
-@@ -15,7 +15,7 @@ if sys.platform.startswith("linux"):
-         libraries=[
-             "mupdf",
-             #'crypto', #openssl is required by mupdf on archlinux
--            #'jbig2dec', 'openjp2', 'jpeg', 'freetype',
-+            'jbig2dec', 'openjp2', 'jpeg', 'freetype', 'harfbuzz',
-             "mupdf-third",
-         ],  # the libraries to link with
-     )
diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec
index f5a2c0a..d7352d6 100644
--- a/python-PyMuPDF.spec
+++ b/python-PyMuPDF.spec
@@ -1,16 +1,15 @@
 %global pypi_name PyMuPDF
 
 Name:           python-%{pypi_name}
-Version:        1.17.4
-Release:        2%{?dist}
+Version:        1.18.0
+Release:        1%{?dist}
 Summary:        Python binding for MuPDF - a lightweight PDF and XPS viewer
 
 # PyMuPDF itself is GPLv3+.  MuPDF (statically linked) is AGPLv3+.
 License:        GPLv3+ and AGPLv3+
 URL:            https://github.com/pymupdf/PyMuPDF
 Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
-# Can be removed if mupdf provides a shared library
-Patch0:         fix-library-linking.patch
+Patch0:         0001-build-against-system-gumbo-library-on-Fedora.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-sphinx
@@ -25,6 +24,7 @@ BuildRequires:  openjpeg2-devel
 BuildRequires:  jbig2dec-devel
 BuildRequires:  freetype-devel
 BuildRequires:  harfbuzz-devel
+BuildRequires:  gumbo-parser-devel
 
 %global _description %{expand:
 This is PyMuPDF, a Python binding for MuPDF - a lightweight PDF and XPS
@@ -72,6 +72,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 %doc demo docs_built/* README.md
 
 %changelog
+* Thu Oct 08 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-1
+- Update to new upstream release 1.18.0
+
 * Fri Sep 18 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.4-2
 - rebuild with jbig2dec 0.19
 
diff --git a/sources b/sources
index 3aca947..c6f0d0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyMuPDF-1.17.4.tar.gz) = 6bd1723619d4caaea0aea749472500bf27b71f4d86425cc7a0771f1c54b27d8841c204f9a25e396e93ad976e0f96ebc352f8f6f4b4b7b4f43cc790933ab4a4b0
+SHA512 (PyMuPDF-1.18.0.tar.gz) = 49ae8e972e6335f1d27895e3af4c056bb18d898d33e43e3a06399f067d0cac2ce835937437bc96a60d388412d23298b5aa8c5f7e44f0f3d7dc0922faf4481fb0