From 8ea33ca253cec51f2766b10c460901b88ee8f94a Mon Sep 17 00:00:00 2001
From: Michael J Gruber <mjg@fedoraproject.org>
Date: Thu, 8 Oct 2020 16:51:08 +0200
Subject: [PATCH] bugfix and feature release

bz #1886338 #1886339 #1886083
---
 .gitignore |  1 +
 mupdf.spec | 11 +++++++----
 sources    |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ae216e9..5e68371 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /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
diff --git a/mupdf.spec b/mupdf.spec
index 7a8e188..c4ba694 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -5,12 +5,11 @@
 
 Name:           mupdf
 Version:        1.18.0
-%global origversion 1.18.0-rc1
-Release:        0.1.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        A lightweight PDF viewer and toolkit
 License:        AGPLv3+
 URL:            http://mupdf.com/
-Source0:        http://mupdf.com/downloads/archive/%{name}-%{origversion}-source.tar.gz
+Source0:        http://mupdf.com/downloads/archive/%{name}-%{version}-source.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}-gl.desktop
 BuildRequires:  gcc gcc-c++ make binutils desktop-file-utils coreutils pkgconfig
@@ -58,7 +57,7 @@ The mupdf-devel package contains header files for developing
 applications that use mupdf and static libraries
 
 %prep
-%setup -q -n %{name}-%{origversion}-source
+%setup -q -n %{name}-%{version}-source
 for d in $(ls thirdparty | grep -v -e freeglut -e lcms2 -e mujs)
 do
   rm -rf thirdparty/$d
@@ -111,6 +110,10 @@ cd %{buildroot}/%{_bindir} && ln -s %{name}-x11 %{name}
 %{_libdir}/lib%{name}*.a
 
 %changelog
+* 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
diff --git a/sources b/sources
index e58c64a..f2be682 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mupdf-1.18.0-rc1-source.tar.gz) = 1ef0fab4bcbb9765d8a264b834e46496e0a1629e56e87b85ec1da826ffd1a10f975f122e0bd180e95530914cd1b2095ec4a113736cc7380dafeb03b1d07d5e06
+SHA512 (mupdf-1.18.0-source.tar.gz) = dd3d413badc5ea50ee100a39aa0265f2d096006e6466f3029ef5f4902e7a9f8e9f958b78ae484524233217ae6ef6ecf56431b8ac462d603a050c4e490503aef1