X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmupdf.git;a=blobdiff_plain;f=mupdf.spec;h=c913240ba153e8133c8844a8dfc3a400a5e7e089;hp=d84bf2df43704d698b6562409f6e21ba62b8becb;hb=c4f136c306747dedaf9cd0ab90619249dd17b1eb;hpb=53171340ae6d849aaae3f25950686e54dd8c346c

diff --git a/mupdf.spec b/mupdf.spec
index d84bf2d..c913240 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -1,44 +1,53 @@
 Summary:	MuPDF - lightweight PDF, XPS and CBZ viewer and parser/rendering library
-Summary(pl.UTF-8):	MuPDF - lekka przeglądarka oraz biblioteka renderująca PDF, XPS, CBZ
+Summary(pl.UTF-8):	MuPDF - lekka przeglądarka PDF, XPS, CBZ
 Name:		mupdf
-Version:	1.9a
+Version:	1.17.0
 Release:	2
 License:	AGPL v3+
 Group:		Applications/Text
-Source0:	http://www.mupdf.com/downloads/%{name}-%{version}-source.tar.gz
-# Source0-md5:	658b90788a57d858dcb069cf326e11c3
-Patch0:		%{name}-openjpeg.patch
-Patch1:		%{name}-shared.patch
-URL:		http://www.mupdf.com/
+Source0:	https://www.mupdf.com/downloads/archive/%{name}-%{version}-source.tar.gz
+# Source0-md5:	f6ffcd81fcd4c57016eb630bcd617c50
+Patch0:		%{name}-shared.patch
+URL:		https://www.mupdf.com/
 BuildRequires:	OpenGL-glut-devel
-BuildRequires:	curl-devel
-BuildRequires:	freetype-devel >= 2
-BuildRequires:	glfw-devel
-BuildRequires:	jbig2dec-devel
+BuildRequires:	curl-devel >= 7.66.0
+BuildRequires:	freetype-devel >= 1:2.10.0
+BuildRequires:	harfbuzz-devel >= 2.6.4
+BuildRequires:	jbig2dec-devel >= 0.18
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	mujs-devel >= 0-0.20160302
-BuildRequires:	openjpeg2-devel >= 2.1.0
-BuildRequires:	openssl-devel
+BuildRequires:	libtool
+BuildRequires:	mujs-devel >= 1.0.6
+BuildRequires:	openjpeg2-devel >= 2.3.1
+BuildRequires:	openssl-devel >= 1.1.0
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	zlib-devel
-Requires:	%{name}-libs = %{version}-%{release}
+BuildRequires:	zlib-devel >= 1.2.11
+Requires:	curl-libs >= 7.66.0
+Requires:	freetype >= 1:2.10.0
+Requires:	harfbuzz >= 2.6.4
+Requires:	jbig2dec >= 0.18
+Requires:	openjpeg2 >= 2.3.1
+Requires:	zlib >= 1.2.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-MuPDF is a lightweight PDF, XPS and CBZ viewer and parser/rendering
-library.
+MuPDF is a lightweight PDF, XPS and CBZ viewer.
 
 %description -l pl.UTF-8
-MuPDF to lekka przeglądarka oraz biblioteka analizująca/renderująca
-pliki PDF, XPS i CBZ.
+MuPDF to lekka przeglądarka pliki PDF, XPS i CBZ.
 
 %package libs
 Summary:	Shared MuPDF libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone MuPDF
 Group:		Libraries
+Requires:	freetype >= 1:2.10.0
+Requires:	jbig2dec >= 0.18
+Requires:	mujs >= 1.0.6
+Requires:	openjpeg2
+Requires:	openssl >= 1.1.0
+Requires:	zlib >= 1.2.11
 
 %description libs
 Shared MuPDF libraries.
@@ -51,14 +60,14 @@ Summary:	Header files for MuPDF libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek MuPDF
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	freetype-devel >= 2
-Requires:	jbig2dec-devel
+Requires:	freetype-devel >= 1:2.10.0
+Requires:	jbig2dec-devel >= 0.18
 Requires:	libjpeg-devel
 Requires:	libstdc++-devel
-Requires:	mujs-devel
-Requires:	openjpeg2-devel >= 2.1.0
-Requires:	openssl-devel
-Requires:	zlib-devel
+Requires:	mujs-devel >= 1.0.6
+Requires:	openjpeg2-devel >= 2.3.1
+Requires:	openssl-devel >= 1.1.0
+Requires:	zlib-devel >= 1.2.11
 
 %description devel
 Header files for MuPDF libraries.
@@ -81,10 +90,20 @@ Statyczne biblioteki MuPDF.
 %prep
 %setup -q -n %{name}-%{version}-source
 %patch0 -p1
-%patch1 -p1
 
-# use system libs instead
-%{__rm} -r thirdparty/{curl,freetype,glfw,jbig2dec,jpeg,mujs,openjpeg,zlib}
+# use system libs instead:
+# curl 7.66.0
+# freetype 2.10.0
+# harfbuzz 2.6.4 + git update (nothing crucial)
+# jbig2dec 0.18
+# libjpeg 9
+# mujs ?
+# openjpeg 2.3.1
+# zlib 1.2.11
+%{__rm} -r thirdparty/{curl,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib}
+# but keep:
+# freeglut - 3.0.0 + some additional keyboard and clipboard APIs
+# lcms2 - "art" fork with tread safety
 
 %build
 CFLAGS="%{rpmcflags} %{rpmcppflags}" \
@@ -92,20 +111,20 @@ LDFLAGS="%{rpmldflags}" \
 %{__make} -j1 \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	HAVE_MUJS=yes \
-	MUJS_CFLAGS= \
-	MUJS_LIBS="-lmujs" \
 	SYS_OPENJPEG_CFLAGS="$(pkg-config --cflags libopenjp2)" \
+	USE_SYSTEM_LIBS=yes \
+	USE_SYSTEM_MUJS=yes \
 	build=release \
 	libdir=%{_libdir} \
-	verbose=1
+	verbose=yes
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	HAVE_MUJS=yes \
+	USE_SYSTEM_LIBS=yes \
+	USE_SYSTEM_MUJS=yes \
 	build=release \
 	prefix=%{_prefix} \
 	libdir=%{_libdir}
@@ -121,10 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CONTRIBUTORS README
-%attr(755,root,root) %{_bindir}/mujstest
+%doc CHANGES CONTRIBUTORS README docs/{index,manual*,thirdparty}.html
+%attr(755,root,root) %{_bindir}/mupdf-gl
 %attr(755,root,root) %{_bindir}/mupdf-x11
 %attr(755,root,root) %{_bindir}/mupdf-x11-curl
+%attr(755,root,root) %{_bindir}/muraster
 %attr(755,root,root) %{_bindir}/mutool
 %{_mandir}/man1/mupdf.1*
 %{_mandir}/man1/mutool.1*
@@ -133,14 +153,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmupdf.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmupdf.so.0
+%attr(755,root,root) %{_libdir}/libmupdf-third.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmupdf-third.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/{naming,overview,progressive,refcount,thirdparty}.txt
 %attr(755,root,root) %{_libdir}/libmupdf.so
+%attr(755,root,root) %{_libdir}/libmupdf-third.so
 %{_libdir}/libmupdf.la
+%{_libdir}/libmupdf-third.la
 %{_includedir}/mupdf
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libmupdf.a
+%{_libdir}/libmupdf-third.a