From 1d0b5ef41dc16f13340ec0d892348726ab88e933 Mon Sep 17 00:00:00 2001
From: Michael J Gruber <mjg(a)fedoraproject.org>
Date: Dec 31 2017 16:18:49 +0000
Subject: rebase to 1.12
---
diff --git a/.gitignore b/.gitignore
index 3075256..9ee30b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/mupdf-1.10a-source.tar.gz
/mupdf-1.11-source.tar.gz
/mupdf-1.12-rc1-source.tar.gz
+/mupdf-1.12.0-source.tar.gz
diff --git a/mupdf.spec b/mupdf.spec
index a4a6e2e..9dbe684 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -1,18 +1,17 @@
Name: mupdf
-Version: 1.12rc1
-%global origversion 1.12-rc1
+Version: 1.12.0
Release: 1%{?dist}
Summary: A lightweight PDF viewer and toolkit
Group: Applications/Publishing
License: GPLv3
URL:
http://mupdf.com/
-Source0:
http://mupdf.com/downloads/%{name}-%{origversion}-source.tar.gz
+Source0:
http://mupdf.com/downloads/%{name}-%{version}-source.tar.gz
Source1: %{name}.desktop
BuildRequires: gcc make binutils desktop-file-utils coreutils
BuildRequires: openjpeg2-devel jbig2dec-devel desktop-file-utils
BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel
BuildRequires: harfbuzz-devel
-BuildRequires: glfw-devel mesa-libGL-devel freeglut-devel
+BuildRequires: mesa-libGL-devel freeglut-devel
Patch0: %{name}-1.12-openjpeg.patch
@@ -42,16 +41,16 @@ 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
rm -rf thirdparty
%patch0 -p1
%build
export XCFLAGS="%{optflags} -fPIC -DJBIG_NO_MEMENTO -DTOFU -DTOFU_CJK"
-make %{?_smp_mflags} build=debug verbose=yes HAVE_GLFW=yes
SYS_GLFW_CFLAGS="-I%{_includedir}/GL -I%{_includedir}/GLFW" GLFW_LIBS="-lGL
-lglfw"
+make %{?_smp_mflags} build=debug verbose=yes HAVE_GLUT=yes
SYS_GLUT_CFLAGS="-I%{_includedir}/GL" GLUT_LIBS="-lGL -lglut"
%install
-make DESTDIR=%{buildroot} install prefix=%{_prefix} libdir=%{_libdir} build=debug
verbose=yes HAVE_GLFW=yes
+make DESTDIR=%{buildroot} install prefix=%{_prefix} libdir=%{_libdir} build=debug
verbose=yes HAVE_GLUT=yes
## handle docs on our own
rm -rf %{buildroot}/%{_docdir}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
@@ -82,6 +81,11 @@ update-desktop-database &> /dev/null || :
%{_libdir}/lib%{name}*.a
%changelog
+* Thu Dec 14 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.12.0-1
+- rebase to 1.12
+- follow switch from GLFW to GLUT
+- follow switch to new version scheme
+
* Sun Nov 26 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.12rc1-1
- rc test
diff --git a/sources b/sources
index faa4bfd..5e8fec0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mupdf-1.12-rc1-source.tar.gz) =
12b232224b2a73794e3a70270b3dd3d6cdb51400c8ec421f2d96436ec5f221f567634851a9892e60a3fe39d74def6f2c666e301fa6f40c4f28e6a26b5dd5deb6
+SHA512 (mupdf-1.12.0-source.tar.gz) =
11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
https://src.fedoraproject.org/rpms/mupdf/c/1d0b5ef41dc16f13340ec0d8923487...