[mupdf/f17] New release

[Pavel Zhukov]

commit c03513dc466910d6e2ed4f5b884d92b1800a4342
Author: Pavel Zhukov <landgraf at fedoraproject.org>
Date:   Sun May 20 20:59:04 2012 +0400

    New release

 .gitignore                  |    1 +
 mupdf-buffer_overflow.patch |   47 ----------------------------------------
 mupdf-upstream.patch        |   14 ++++++++++++
 mupdf.spec                  |   50 +++++++++++++++++++++++++------------------
 sources                     |    2 +-
 5 files changed, 45 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a779ea9..4989f28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /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
diff --git a/mupdf-upstream.patch b/mupdf-upstream.patch
new file mode 100644
index 0000000..34c449e
--- /dev/null
+++ b/mupdf-upstream.patch
@@ -0,0 +1,14 @@
+--- a/fitz/image_jpx.c
++++ b/fitz/image_jpx.c
+@@ -50,8 +50,11 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
+ 	evtmgr.info_handler = fz_opj_info_callback;
+ 
+ 	opj_set_default_decoder_parameters(&params);
++
++#ifdef OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG
+ 	if (indexed)
+ 		params.flags |= OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
++#endif
+ 
+ 	info = opj_create_decompress(format);
+ 	opj_set_event_mgr((opj_common_ptr)info, &evtmgr, ctx);
diff --git a/mupdf.spec b/mupdf.spec
index 30be267..ffacff1 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -1,14 +1,14 @@
 Name:           mupdf
-Version:        0.9
-Release:        3%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        A lightweight PDF viewer and toolkit
-
 Group:          Applications/Publishing
 License:        GPLv3
 URL:            http://mupdf.com/
 Source0:        http://mupdf.com/download/%{name}-%{version}-source.tar.gz
 Source1:        %{name}.desktop
-Patch0:         %{name}-buffer_overflow.patch
+## http://bugs.ghostscript.com/show_bug.cgi?format=multiple&id=693010
+Patch0:         %{name}-upstream.patch
 BuildRequires:  openjpeg-devel jbig2dec-devel desktop-file-utils
 BuildRequires:  libjpeg-devel freetype-devel libXext-devel
 
@@ -38,19 +38,20 @@ The mupdf-devel package contains header files for developing
 applications that use mupdf and static libraries
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}-source
+%patch0 -p1 
 
 %build
 export CFLAGS="%{optflags}"
-make %{?_smp_mflags} verbose=1 
+make  -j1 
+## %{?_smp_mflags} verbose=1 
 
 %install
 make DESTDIR=%{buildroot} install prefix=%{buildroot}/usr libdir=%{buildroot}%{_libdir}
 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
+### mv %{buildroot}%{_bindir}/pdfinfo %{buildroot}%{_bindir}/pdfinfo-mupdf
 ## fix strange permissons
 chmod 0644 %{buildroot}/%{_includedir}/*.h
 chmod 0644 %{buildroot}%{_libdir}/*.a
@@ -65,27 +66,34 @@ update-desktop-database &> /dev/null || :
 %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
+%{_bindir}/mudraw
+%{_bindir}/mupdf
+%{_bindir}/mupdfclean
+%{_bindir}/mupdfextract
+%{_bindir}/mupdfinfo
+%{_bindir}/mupdfshow
+%{_datadir}/applications/mupdf.desktop
+%{_mandir}/man1/mudraw.1.gz
+%{_mandir}/man1/mupdf.1.gz
+%{_mandir}/man1/mupdfclean.1.gz
+%{_mandir}/man1/mupdfshow.1.gz
+%{_datadir}/pixmaps/mupdf.xpm
+
+
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/fitz.h
-%{_includedir}/%{name}.h
+%{_includedir}/memento.h
+%{_includedir}/mucbz.h
+%{_includedir}/mupdf.h
 %{_includedir}/muxps.h
 %{_libdir}/libfitz.a
-%{_libdir}/libmupdf.a
-%{_libdir}/libmuxps.a
 
 %changelog
+* Sun May 20 2012  Pavel Zhukov <landgraf at fedoraproject.org> - 1.0-1
+- New release
+
 * Wed Mar 14 2012  Pavel Zhukov <landgraf at fedoraproject.org> - 0.9-2
 - Fix buffer overflow (#752388)
 
diff --git a/sources b/sources
index 0190526..fbb1dec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76640ee16a797a27fe49cc0eaa87ce3a  mupdf-0.9-source.tar.gz
+d986ab98e2b035b7abd61afc474562b3  mupdf-1.0-source.tar.gz