Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

rebase to 1.24.5 (rhbz#2290729)
- various bugfixes all across the board
2024-07-18 18:56:45 +00:00 · 2024-07-10 11:58:58 +02:00 · 2024-06-20 15:50:53 +02:00 · 2024-06-13 22:39:24 +02:00 · 2024-06-09 13:43:25 +02:00 · 2024-06-06 14:37:32 +02:00
8 changed files with 519 additions and 88 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,51 @@
 /mupdf-0.7.tar.gz
 /mupdf-0.8.15-source.tar.gz
 /mupdf-0.8.165-source.tar.gz
+/mupdf-0.9-source.tar.gz
+/mupdf-1.0-source.tar.gz
+/mupdf-1.1-source.tar.gz
+/mupdf-1.4-source.tar.gz
+/mupdf-1.5-source.tar.gz
+/mupdf-1.7-source.tar.gz
+/mupdf-1.7a-source.tar.gz
+/mupdf-1.8-source.tar.gz
+/mupdf-1.10a-source.tar.gz
+/mupdf-1.11-source.tar.gz
+/mupdf-1.12-rc1-source.tar.gz
+/mupdf-1.12.0-source.tar.gz
+/mupdf-1.13.0-rc1-source.tar.gz
+/mupdf-1.13.0-source.tar.gz
+/mupdf-1.14.0-rc1-source.tar.gz
+/mupdf-1.14.0-source.tar.gz
+/mupdf-1.15.0-rc1-source.tar.gz
+/mupdf-1.15.0-source.tar.gz
+/mupdf-1.16.1-source.tar.gz
+/mupdf-1.17.0-source.tar.gz
+/mupdf-1.18.0-rc1-source.tar.gz
+/mupdf-1.18.0-source.tar.gz
+/mupdf-1.19.0-source.tar.gz
+/mupdf-1.20.0-rc1-source.tar.gz
+/mupdf-1.20.0-rc2-source.tar.gz
+/mupdf-1.20.0-source.tar.gz
+/mupdf-1.20.3-source.tar.gz
+/mupdf-1.21.0-rc1-source.tar.gz
+/mupdf-1.21.0-source.tar.gz
+/mupdf-1.21.1-source.tar.gz
+/mupdf-1.22.0-source.tar.gz
+/mupdf-1.22.1-source.tar.gz
+/mupdf-1.22.2-source.tar.gz
+/mupdf-1.23.2-source.tar.gz
+/mupdf-1.23.3-source.tar.gz
+/mupdf-1.23.4-source.tar.gz
+/mupdf-1.23.5-source.tar.gz
+/mupdf-1.23.7-source.tar.gz
+/mupdf-1.23.8-source.tar.gz
+/mupdf-1.23.9-source.tar.gz
+/mupdf-1.23.10-source.tar.gz
+/mupdf-1.24.0-source.tar.gz
+/mupdf-1.24.1-source.tar.gz
+/mupdf-1.24.2-source.tar.gz
+/mupdf-1.24.3-source.tar.gz
+/mupdf-1.24.4-source.tar.gz
+/mupdf-1.24.5-source.tar.gz
+/mupdf-1.24.6-source.tar.gz
--- a/0001-Do-not-complain-to-your-friendly-local-distribution-.patch
+++ b/0001-Do-not-complain-to-your-friendly-local-distribution-.patch
@ -0,0 +1,29 @@
+From 2fdf3e160fc2f30324d1ce9eaceedd3f0ea158bd Mon Sep 17 00:00:00 2001
+Message-ID: <2fdf3e160fc2f30324d1ce9eaceedd3f0ea158bd.1717676942.git.mjg@fedoraproject.org>
+From: Michael J Gruber <mjg@fedoraproject.org>
+Date: Thu, 6 Jun 2024 14:27:12 +0200
+Subject: [PATCH] Do not complain to your friendly local distribution manager
+
+Artifex decided to rely on local forks for added functionality, so do
+not complain to the distribution manager about lack of functionality in
+unbundled builds.
+---
+ platform/gl/gl-ui.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/platform/gl/gl-ui.c b/platform/gl/gl-ui.c
+index d3dfb1de6..c0d9d72d7 100644
+--- a/platform/gl/gl-ui.c
+++ b/platform/gl/gl-ui.c
+@@ -449,8 +449,6 @@ void ui_init(int w, int h, const char *title)
+ #if defined(FREEGLUT) && (GLUT_API_VERSION >= 6)
+ 	glutKeyboardExtFunc(on_keyboard);
+ #else
+-	fz_warn(ctx, "This version of MuPDF has been built WITHOUT clipboard or unicode input support!");
+-	fz_warn(ctx, "Please file a complaint with your friendly local distribution manager.");
+ 	glutKeyboardFunc(on_keyboard);
+ #endif
+ 	glutSpecialFunc(on_special);
+-- 
+2.45.2.607.ge77ae43106
+
--- a/0001-add-missing-header-for-fz_archive.patch
+++ b/0001-add-missing-header-for-fz_archive.patch
@ -0,0 +1,28 @@
+From e3423caf5820d97970068a243427c2bdc576fe26 Mon Sep 17 00:00:00 2001
+Message-ID: <e3423caf5820d97970068a243427c2bdc576fe26.1710968212.git.mjg@fedoraproject.org>
+From: Michael J Gruber <mjg@fedoraproject.org>
+Date: Wed, 20 Mar 2024 21:55:23 +0100
+Subject: [PATCH] add missing header for fz_archive
+
+2eb4c51a4 ("Reduce document handler open functions to a single one.",
+2024-01-08) introduced an additional fz_archive argument. Include the
+header which defines the argument type.
+---
+ include/mupdf/fitz/document.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/mupdf/fitz/document.h b/include/mupdf/fitz/document.h
+index a23340768..a732fa5d8 100644
+--- a/include/mupdf/fitz/document.h
+++ b/include/mupdf/fitz/document.h
+@@ -32,6 +32,7 @@
+ #include "mupdf/fitz/link.h"
+ #include "mupdf/fitz/outline.h"
+ #include "mupdf/fitz/separation.h"
+#include "mupdf/fitz/archive.h"
+ 
+ typedef struct fz_document_handler fz_document_handler;
+ typedef struct fz_page fz_page;
+-- 
+2.44.0.458.ge6d7a2c32c
+
--- a/269
+++ b/269
@ -0,0 +1,269 @@
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.18.0-9
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 14 2021 Scott Talbert <swt@techie.net> - 1.18.0-7
+- Enable DroidSansFallback font
+
+* Wed Feb 24 2021 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-6
+- remove obsolete PyMuPDF support
+
+* Tue Feb 23 2021 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-5
+- CVE-2021-3407 (bz #1931964, bz#1931965)
+
+* Tue Jan 26 2021 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-4
+- (original date: Thu Oct 29 2020)
+- remove obsolete patch
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Oct 08 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-2
+- support PyMuPDF
+
+* Thu Oct 08 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-1
+- bugfix and feature release
+- bz #1886338 #1886339 #1886083
+
+* Sun Oct 04 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-0.1.rc1
+- properly name the rc prerelease
+- update versions of bundled libs
+
+* Sat Oct 03 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-rc1
+- mupdf 1.18.0-rc1 test
+
+* Fri Sep 18 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-4
+- rebuild with jbig2dec 0.19
+
+* Mon Jul 27 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-3
+- depend on exact jbig2dec version (bz 1861103)
+
+* Sun May 31 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-2
+- fix signature check crash
+
+* Mon May 11 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-1
+- rebase to 1.17.0 (bz #1831652)
+
+* Wed Feb 05 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.16.1-3
+- fix build with gcc 10
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Aug 16 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.16.1-1
+- rebase to 1.16.1
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue May 07 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.15.0-1
+- rebase to 1.15.0
+
+* Mon Apr 29 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.15rc1-1
+- rc1 test
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-7
+- work around missing mesa EGl dependency
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-6
+- signature handling fix needs more patches than claimed
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-5
+- fix signature handling
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-4
+- bz #1644444 #1644445
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-3
+- bz #1626481 #1626484
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-2
+- bz #1626483 #1626484
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-1
+- rebase to 1.14.0
+
+* Mon Oct 01 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-3
+- mupdf-gl desktop entry
+
+* Mon Oct 01 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-2
+- enable libcrypto
+
+* Wed Sep 26 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-1
+- rc test
+- adjust to new build system setup
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Jun 10 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-8
+- CVE-2018-10289 (rh bz #1573050) (gs bz #699271)
+
+* Wed Jun 06 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-7
+- fix license field (bug #1586328)
+
+* Sun Jun 03 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-6
+- fix lcms2art build on big endian
+
+* Fri May 18 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-5
+- fix BR (pulled in by freeglut-devel before)
+
+* Mon Apr 23 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-4
+- bundle unicode safe freeglut
+
+* Mon Apr 23 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-3
+- include (now non-empty) libmupdfthird.a again (fixes bug #1553915 for zathura-pdf-mupdf)
+
+* Fri Apr 20 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-2
+- bundle thread-safe lcms2 (fixes bug #1553915)
+
+* Fri Apr 20 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-1
+- rebase to 1.13.0 (rh bz #1569993)
+
+* Fri Apr 13 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-6
+- install svg icon
+
+* Fri Apr 13 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-6
+- install svg icon
+
+* Wed Feb 14 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-5
+- CVE-2018-6192 (rh bz #1539845 #1539846) (gs bz #698916)
+- CVE-2018-6544 (rh bz #1542264 #1542265) (gs bz #698830 #698965)
+- CVE-2018-1000051 (rh bz #1544847 #1544848) (gs bz #698825 #698873)
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Feb 06 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-4
+- CVE-2018-6187 (rh bz #1538432 #1538433) (gs bz #698908)
+
+* Wed Jan 24 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-2
+- CVE-2017-17858 (rh bz #1537952) (gs bz #698819)
+- CVE-2018-5686 (gs bz #698860)
+
+* Thu Dec 14 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-1
+- rebase to 1.12
+- follow switch from GLFW to GLUT
+- follow switch to new version scheme
+
+* Sun Nov 26 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.12rc1-1
+- rc test
+
+* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-9
+- CVE-2017-15369
+- CVE-2017-15587
+
+* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-8
+- repair FTBFS from version specific patch in 412e729 ("New release 1.11", 2017-04-11)
+
+* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-7
+- rebuild with jbig2dec 0.14 (#1456731)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue May 09 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-4
+- Rebuild with new jbig2dec (#1443933)
+
+* Fri Apr 14 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-3
+- Fix mupdf-gl build (#1442384)
+
+* Tue Apr 11 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-1
+- New release 1.11 (#1441186)
+
+* Thu Apr  6 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-5
+- Fix stack consumption CVE (#1439643)
+
+* Thu Mar  2 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-4
+- fix buffer overflow (#1425338)
+
+* Thu Mar 02 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.10a-3
+- Several packaging fixes
+
+* Thu Feb 23 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-2
+- Add comment with explanation of disabled debuginfo
+- Fix make verbose output
+
+* Sat Feb 11 2017 Pavel Zhukov <pzhukov@redhat.com> - 1.10a-1
+- New release (1.10a)
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Nov 28 2015 Pavel Zhukov <landgraf@fedoraproject.org> -1.8-1
+- New release (#1280518)
+
+* Sat Nov 28 2015 Pavel Zhukov <landgraf@fedoraproject.org> -1.7a-4
+- Disable memento
+
+* Wed Nov 18 2015 Petr Šabata <contyk@redhat.com> - 1.7a-3
+- Package the license text with the %%license macro
+- Don't use the %%version macro in filenames, it's not helpful
+- Added extra handling for the docs; %%_docdir is no longer autopackaged,
+  plus we want to install the license text elsewhere
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Jun 01 2015  Pavel Zhukov <landgraf@fedoraproject.org> - 1.7a-1
+- New release 1.7a (#1219482)
+* Wed May 06 2015  Pavel Zhukov <landgraf@fedoraproject.org> - 1.7-1
+- New release 1.7 (#1210318)
+- Fix segfault in obj_close routine (#1202137, #1215752)
+
+* Wed May 06 2015 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-6
+- Fix executable name in desktop file
+
+* Sat Oct 11 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-5
+- Add missed curl-devel
+
+* Fri Jul 04 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-3
+- Add fPIC flag (#1109589)
+- Add curl-devel to BR (#1114566)
+
+* Sun Jun 15 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-2
+- Add fix for new openjpeg2
+
+* Sun Jun 15 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-1
+- New release 1.5 (#1108710)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May  6 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.4-1
+- New release 1.4 (#1087287)
+
+* Fri Jan 24 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.1-5
+- Fix stack overflow (#1056699)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.1-2
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Wed Jan 09 2013 Pavel Zhukov <landgraf@fedoraproject.org> - 1.1-1
+- New release
+
+* Sun May 20 2012  Pavel Zhukov <landgraf@fedoraproject.org> - 1.0-1
+- New release
+
+* Wed Mar 14 2012  Pavel Zhukov <landgraf@fedoraproject.org> - 0.9-2
+- Fix buffer overflow (#752388)
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--- a/mupdf-gl.desktop
+++ b/mupdf-gl.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Mupdf-GL
+GenericName=PDF file viewer
+Comment=Lightweight PDF file viewer written on portable C
+Exec=mupdf-gl %f
+Icon=mupdf-gl
+Terminal=false
+Type=Application
+Categories=Viewer;Graphics;
+MimeType=application/pdf;application/x-pdf;
--- a/mupdf.desktop
+++ b/mupdf.desktop
@ -2,7 +2,7 @@
 Name=Mupdf
 GenericName=PDF file viewer
 Comment=Lightweight PDF file viewer written on portable C
-Exec=mupdf %f
+Exec=mupdf-x11 %f
 Icon=mupdf
 Terminal=false
 Type=Application
--- a/mupdf.spec
+++ b/mupdf.spec
@ -1,15 +1,41 @@
 Name:		mupdf
-Version:        0.8.165
-Release:        2%{?dist}
+%global libname libmupdf
+Version:	1.24.6
+%global pypiname mupdf
+# upstream prerelease versions tags need to be translated to Fedorian
+%global upversion %{version}
+%global soname 24.6
+Release:	%autorelease
 Summary:	A lightweight PDF viewer and toolkit
-
-Group:          Applications/Publishing
-License:        GPLv3
+License:	AGPL-3.0-or-later
 URL:		http://mupdf.com/
-Source0:        http://mupdf.com/download/%{name}-%{version}-source.tar.gz
+Source0:	http://mupdf.com/downloads/archive/%{name}-%{upversion}-source.tar.gz
 Source1:	%{name}.desktop
-BuildRequires:  openjpeg-devel jbig2dec-devel desktop-file-utils
-BuildRequires:  libjpeg-devel freetype-devel libXext-devel
+Source2:	%{name}-gl.desktop
+# Upstreamable patches:
+# https://bugs.ghostscript.com/show_bug.cgi?id=707682
+Patch:		0001-add-missing-header-for-fz_archive.patch
+# Fedora specific patches:
+# Do not bug me if Artifex relies on local fork
+Patch:		0001-Do-not-complain-to-your-friendly-local-distribution-.patch
+BuildRequires:	gcc gcc-c++ make binutils desktop-file-utils coreutils pkgconfig
+BuildRequires:	openjpeg2-devel desktop-file-utils
+BuildRequires:	libjpeg-devel freetype-devel libXext-devel curl-devel
+BuildRequires:	harfbuzz-devel openssl-devel mesa-libEGL-devel
+BuildRequires:	mesa-libGL-devel mesa-libGLU-devel libXi-devel libXrandr-devel
+BuildRequires:	gumbo-parser-devel leptonica-devel tesseract-devel
+BuildRequires:	freeglut-devel
+BuildRequires:	jbig2dec-devel
+BuildRequires:	swig python3-clang python3-devel
+# We need to build against the Artifex fork of lcms2 so that we are thread safe
+# (see bug #1553915). Artifex make sure to rebase against upstream, who refuse
+# to integrate Artifex's changes. 
+Provides:	bundled(lcms2-devel) = 2.14~rc1^60.gab4547b
+# muPDF needs the muJS sources for the build even if we build against the system
+# version so bundling them is the safer choice.
+Provides:	bundled(mujs-devel) = 1.3.3
+# muPDF builds only against in-tree extract which is versioned along with ghostpdl.
+Provides:	bundled(extract) = 10.01.2^1.ged5acb1

 %description
 MuPDF is a lightweight PDF viewer and toolkit written in portable C.
@ -19,7 +45,7 @@ within fractions of a pixel for the highest fidelity in reproducing
 the look of a printed page on screen.
 MuPDF has a small footprint. A binary that includes the standard
 Roman fonts is only one megabyte. A build with full CJK support
-(including an Asian font) is approximately five megabytes.
+(including an Asian font) is approximately seven megabytes.
 MuPDF has support for all non-interactive PDF 1.7 features, and the
 toolkit provides a simple API for accessing the internal structures of
 the PDF document. Example code for navigating interactive links and
@ -27,88 +53,109 @@ bookmarks, encrypting PDF files, extracting fonts, images, and
 searchable text, and rendering pages to image files is provided.

 %package devel
-Summary:        Development files for %{name}
-Group:            Development/Libraries
-Requires:         %{name} = %{version}-%{release}
-Provides:         %{name}-static = %{version}-%{release}
+Summary:	C Development files for %{name}
+Requires:	%{name}-libs%{_isa} = %{version}-%{release}

 %description devel
-The mupdf-devel package contains header files for developing
-applications that use mupdf and static libraries
+The mupdf-devel package contains library and header files for developing
+C applications that use the mupdf library.
+
+%package libs
+Summary:	C Library files for %{name}
+
+%description libs
+The mupdf-libs package contains the mupdf C library files.
+
+%package cpp-devel
+Summary:	C++ Development files for %{name}
+Requires:	%{name}-cpp-libs%{_isa} = %{version}-%{release}
+
+%description cpp-devel
+The mupdf-cpp-devel package contains library and header files for developing
+C++ applications that use the mupdf library.
+
+%package cpp-libs
+Summary:	C++ Library files for %{name}
+
+%description cpp-libs
+The mupdf-cpp-libs package contains the mupdf C++ library files.
+
+%package -n python3-%{pypiname}
+Summary:	Python bindings for %{name}
+
+%description -n python3-%{pypiname}
+The python3-%{pypiname} package contains low level mupdf python bindings.

 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{upversion}-source
+for d in $(ls thirdparty | grep -v -e extract -e lcms2 -e mujs)
+do
+	rm -rf thirdparty/$d
+done
+
+echo > user.make "\
+	USE_SYSTEM_LIBS := yes
+	USE_SYSTEM_MUJS := no # build needs source anyways
+	USE_TESSERACT := yes
+	VENV_FLAG :=
+	build := debug
+	shared := yes
+	verbose := yes
+"
+
+# c++ and python install targets rebuild unconditionally. Avoid multiple rebuilds:
+sed -i -e '/^install-shared-c++:/s/ c++//' Makefile
+sed -i -e '/^install-shared-python:/s/ python//' Makefile

 %build
-export CFLAGS="%{optflags}"
-make %{?_smp_mflags} verbose=1 
+export XCFLAGS="%{optflags} -fPIC -DJBIG_NO_MEMENTO -DTOFU -DTOFU_CJK_EXT"
+make %{?_smp_mflags} c++ python

 %install
-make DESTDIR=%{buildroot} install prefix=%{buildroot}/usr libdir=%{buildroot}%{_libdir}
+make DESTDIR=%{buildroot} install install-shared-c install-shared-c++ install-shared-python prefix=%{_prefix} libdir=%{_libdir} pydir=%{python3_sitearch} SO_INSTALL_MODE=755
+# wheel bundles too much, so build & install with make and generate metadata here:
+MUPDF_SETUP_VERSION=%{version} %{__python3} setup.py dist_info
+mkdir -p %{buildroot}/%{python3_sitearch}/%{pypiname}-%{version}.dist-info
+install -p -m644 mupdf-*.dist-info/METADATA/PKG-INFO %{buildroot}/%{python3_sitearch}/%{pypiname}-%{version}.dist-info/METADATA
+# handle docs on our own
+rm -rf %{buildroot}/%{_docdir}
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-install -D -m644 debian/%{name}.xpm %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm
-## filename conflict with poppler
-mv %{buildroot}%{_bindir}/pdfinfo %{buildroot}%{_bindir}/pdfinfo-mupdf
-## fix strange permissons
-chmod 0644 %{buildroot}/%{_includedir}/*.h
-chmod 0644 %{buildroot}%{_libdir}/*.a
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+install -p -m644 docs/logo/mupdf-logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/mupdf.svg
+install -p -m644 docs/logo/mupdf-logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/mupdf-gl.svg
 find %{buildroot}/%{_mandir} -type f -exec chmod 0644 {} \;
-
-%post
-update-desktop-database &> /dev/null || :
-
-%postun
-update-desktop-database &> /dev/null || :
+find %{buildroot}/%{_includedir} -type f -exec chmod 0644 {} \;
+cd %{buildroot}/%{_bindir} && ln -s %{name}-x11 %{name}

 %files
-%defattr(-,root,root,-)
-%doc COPYING README
-%{_bindir}/%{name}
-%{_bindir}/pdfclean
-%{_bindir}/pdfdraw
-%{_bindir}/pdfextract
-%{_bindir}/pdfshow
-%{_bindir}/pdfinfo-mupdf
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.xpm
-%{_mandir}/man?/*.1*
-%{_bindir}/xpsdraw
+%license COPYING
+%doc README CHANGES docs/*
+%{_bindir}/*
+%{_datadir}/applications/mupdf*.desktop
+%{_datadir}/icons/hicolor/*/apps/*
+%{_mandir}/man1/*.1.gz

 %files devel
-%defattr(-,root,root,-)
-%{_includedir}/fitz.h
-%{_includedir}/%{name}.h
-%{_includedir}/muxps.h
-%{_libdir}/libfitz.a
-%{_libdir}/libmupdf.a
-%{_libdir}/libmuxps.a
+%{_includedir}/%{name}
+%{_libdir}/%{libname}.so
+
+%files libs
+%license COPYING
+%{_libdir}/%{libname}.so.%{soname}
+
+%files cpp-devel
+%{_includedir}/%{name}
+%{_libdir}/%{libname}cpp.so
+
+%files cpp-libs
+%license COPYING
+%{_libdir}/%{libname}cpp.so.%{soname}
+
+%files -n python3-%{pypiname}
+%license COPYING
+%{python3_sitearch}/%{pypiname}/
+%{python3_sitearch}/%{pypiname}-%{version}.dist-info/

 %changelog
-* Tue May 03 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.8.165-2
- New upstream release
- Fix *.a and *.h permissions
-
-* Sun Mar 27 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.8.15-1
- New upstream release
-
-* Tue Feb 9 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-7
- Fix dependency for F13
-
-* Sun Feb 7 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-6
- roll back to static libraries  patch for shared libs has been rejected
- Fix spec errors 
-
-* Fri Jan 14 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-4
- replac poitless macros to command names
-
-* Fri Jan 14 2011 Pavel Zhukov <landgraf@fedoraproject.org> - 0.7-3
- Create patch for optflags
- Change Summary
- Fix Require for devel package
-
-* Thu Jan 13 2011 Pavel Zhukov <landgraf@fedoraproject.org> -0.7-2
- add Fedora CFLAGS
- create patch for use shared library
-
-* Wed Jan 12 2011 Pavel Zhukov <landgraf@fedoraproject.org>  - 0.7-1
- Initial package
+%autochangelog
--- a/2
+++ b/2
@ -1 +1 @@
-a95813737924e60d87a944d52b6a5120  mupdf-0.8.165-source.tar.gz
+SHA512 (mupdf-1.24.6-source.tar.gz) = 251a347cc98c837070f01abfc9463a16867e22d06a015967e3e6f4a886c2599c0027641fc36e3f6f50602e088fe9338325007988dcf00f935b2a7dde48615020