diff --git a/.gitignore b/.gitignore index dadfacf..31849ce 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /mupdf-1.4-source.tar.gz /mupdf-1.5-source.tar.gz /mupdf-1.7-source.tar.gz +/mupdf-1.7a-source.tar.gz diff --git a/mupdf-1.7a-openjpeg.patch b/mupdf-1.7a-openjpeg.patch new file mode 100644 index 0000000..46d1389 --- /dev/null +++ b/mupdf-1.7a-openjpeg.patch @@ -0,0 +1,13 @@ +diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c +index dd7bf9e..3a1c7a8 100644 +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -116,7 +116,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs + opj_stream_set_read_function(stream, fz_opj_stream_read); + opj_stream_set_skip_function(stream, fz_opj_stream_skip); + opj_stream_set_seek_function(stream, fz_opj_stream_seek); +- opj_stream_set_user_data(stream, &sb); ++ opj_stream_set_user_data(stream, &sb, NULL); + /* Set the length to avoid an assert */ + opj_stream_set_user_data_length(stream, size); + diff --git a/mupdf.spec b/mupdf.spec index dfbca87..70ef31d 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -1,6 +1,6 @@ Name: mupdf -Version: 1.7 -Release: 2%{?dist} +Version: 1.7a +Release: 1%{?dist} Summary: A lightweight PDF viewer and toolkit Group: Applications/Publishing License: GPLv3 @@ -53,6 +53,7 @@ chmod 0644 %{buildroot}%{_libdir}/*.a find %{buildroot}/%{_mandir} -type f -exec chmod 0644 {} \; find %{buildroot}/%{_docdir} -type f -exec chmod 0644 {} \; find %{buildroot}/%{_includedir} -type f -exec chmod 0644 {} \; +cd %{buildroot}/%{_bindir} && ln -s %{name}-x11 %{name} %post update-desktop-database &> /dev/null || : @@ -75,6 +76,8 @@ update-desktop-database &> /dev/null || : %{_libdir}/lib%{name}.a %Changelog +* Mon Jun 01 2015 Pavel Zhukov - 1.7a-1 +- New release 1.7a (#1219482) * Wed May 06 2015 Pavel Zhukov - 1.7-1 - New release 1.7 (#1210318) - Fix segfault in obj_close routine (#1202137, #1215752) diff --git a/sources b/sources index 67b793e..8ef0f9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81d36f436a7065c81a501ed7ff4ee21e mupdf-1.7-source.tar.gz +319fda2cc5301bb3ec2e1d82c3329986 mupdf-1.7a-source.tar.gz