From c2ba1b592716be8caf17bfa37f5baee38d16514783be86369edafa02d73ee68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 21 Dec 2016 11:55:23 +0000
Subject: [PATCH] - Update to version 1.10a   * A bug with mutool and saving
 PDF files using the 'ascii'     option has been fixed. - Add
 fix-openjpeg-flags.patch to stop defining OPJ_STATIC,   this is
 https://github.com/uclouvain/openjpeg/issues/802

OBS-URL: https://build.opensuse.org/package/show/Publishing/mupdf?expand=0&rev=43
---
 fix-openjpeg-flags.patch  | 15 +++++++++++++++
 mupdf-1.10-source.tar.gz  |  3 ---
 mupdf-1.10a-source.tar.gz |  3 +++
 mupdf.changes             |  9 +++++++++
 mupdf.spec                | 12 ++++++------
 5 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 fix-openjpeg-flags.patch
 delete mode 100644 mupdf-1.10-source.tar.gz
 create mode 100644 mupdf-1.10a-source.tar.gz

diff --git a/fix-openjpeg-flags.patch b/fix-openjpeg-flags.patch
new file mode 100644
index 0000000..ae68d14
--- /dev/null
+++ b/fix-openjpeg-flags.patch
@@ -0,0 +1,15 @@
+Index: mupdf-1.10a-source/source/fitz/load-jpx.c
+===================================================================
+--- mupdf-1.10a-source.orig/source/fitz/load-jpx.c
++++ mupdf-1.10a-source/source/fitz/load-jpx.c
+@@ -481,10 +481,6 @@ fz_load_jpx_info(fz_context *ctx, unsign
+ 
+ #else /* HAVE_LURATECH */
+ 
+-/* Without the definition of OPJ_STATIC, compilation fails on windows
+- * due to the use of __stdcall. We believe it is required on some
+- * linux toolchains too. */
+-#define OPJ_STATIC
+ #ifndef _MSC_VER
+ #define OPJ_HAVE_STDINT_H
+ #endif
diff --git a/mupdf-1.10-source.tar.gz b/mupdf-1.10-source.tar.gz
deleted file mode 100644
index 9ac7975..0000000
--- a/mupdf-1.10-source.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1185637a93055cdae8335db14fef3e0fbd2acadae94eabd2ec0111d89a04a667
-size 42265171
diff --git a/mupdf-1.10a-source.tar.gz b/mupdf-1.10a-source.tar.gz
new file mode 100644
index 0000000..eab126c
--- /dev/null
+++ b/mupdf-1.10a-source.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836
+size 42264707
diff --git a/mupdf.changes b/mupdf.changes
index 865928e..e21dce6 100644
--- a/mupdf.changes
+++ b/mupdf.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Dec 20 12:20:07 UTC 2016 - idonmez@suse.com
+
+- Update to version 1.10a
+  * A bug with mutool and saving PDF files using the 'ascii'
+    option has been fixed.
+- Add fix-openjpeg-flags.patch to stop defining OPJ_STATIC,
+  this is https://github.com/uclouvain/openjpeg/issues/802
+
 -------------------------------------------------------------------
 Thu Nov 24 14:56:53 UTC 2016 - idonmez@suse.com
 
diff --git a/mupdf.spec b/mupdf.spec
index 3450fb3..bd6e75b 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -18,7 +18,7 @@
 
 
 Name:           mupdf
-Version:        1.10
+Version:        1.10a
 Release:        0
 Summary:        Lightweight PDF and XPS Viewer and Parser and Rendering Library
 License:        AGPL-3.0+
@@ -27,6 +27,7 @@ Url:            http://mupdf.com/
 Source0:        http://mupdf.com/downloads/mupdf-%{version}-source.tar.gz
 Source1:        mupdf.desktop
 Source2:        mupdf.png
+Patch1:         fix-openjpeg-flags.patch
 BuildRequires:  freetype-devel
 BuildRequires:  gcc-c++
 BuildRequires:  jbig2dec-devel
@@ -62,6 +63,7 @@ based on mupdf.
 
 %prep
 %setup -q -n %{name}-%{version}-source
+%patch1 -p1
 
 # do not use the inlined copies of build dpendencies except for mujs
 rm -rf $(ls -d thirdparty/*/ | grep -v mujs)
@@ -73,9 +75,11 @@ for src in docs/*.c; do
     fi
 done
 
+sed -i s,'INSTALL_APPS := .*','INSTALL_APPS := $(MUTOOL) $(MUVIEW_CURL)', Makefile
+
 %build
 # do no set CFLAGS which is used by the build system itself!
-export XCFLAGS="%{optflags} -DAA_BITS=8 -fPIC -pthread"
+export XCFLAGS="%{optflags} -fPIC -lpthread"
 make %{?_smp_mflags} \
     build=release \
     verbose=yes \
@@ -89,10 +93,6 @@ make %{?_smp_mflags} \
 
 mv %{buildroot}%{_bindir}/mupdf-x11-curl %{buildroot}%{_bindir}/mupdf
 
-rm %{buildroot}%{_bindir}/mujstest
-rm %{buildroot}%{_bindir}/mupdf-x11
-rm %{buildroot}%{_bindir}/muraster
-
 rm -rf %{buildroot}%{_datadir}/doc/
 
 chmod 0644 %{buildroot}%{_includedir}/mupdf/*.h \