From 1f76ff7f903e4d99f97d4e2da1fdec6bd314593a06f663465cdc6355c47461aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 21 Jun 2017 19:18:54 +0000
Subject: [PATCH] - Use %ctest macro - Update license string to lgpl2.1+ and
 mpl2.0+ - Remove patch graphite2-CVE-2017-5436.patch - Update to 1.3.10:   *
 Upstream marks this as contianing various bugfixes without     any specific
 mentions

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/graphite2?expand=0&rev=48
---
 1.3.10.tar.gz                 |  3 +++
 1.3.9.tar.gz                  |  3 ---
 graphite2-CVE-2017-5436.patch | 23 -----------------------
 graphite2.changes             | 10 ++++++++++
 graphite2.spec                |  9 +++------
 5 files changed, 16 insertions(+), 32 deletions(-)
 create mode 100644 1.3.10.tar.gz
 delete mode 100644 1.3.9.tar.gz
 delete mode 100644 graphite2-CVE-2017-5436.patch

diff --git a/1.3.10.tar.gz b/1.3.10.tar.gz
new file mode 100644
index 0000000..d071df9
--- /dev/null
+++ b/1.3.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68908cf38cfe09d8aadbbb2c5197f1784e3c1df4be315a462f59e2a1f85cbbc2
+size 3889555
diff --git a/1.3.9.tar.gz b/1.3.9.tar.gz
deleted file mode 100644
index 7c88ec2..0000000
--- a/1.3.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f82f92d86a63da79eba10a37c80d943dce883bd72dbc99ebe5bdb7022d3e2391
-size 3888994
diff --git a/graphite2-CVE-2017-5436.patch b/graphite2-CVE-2017-5436.patch
deleted file mode 100644
index bb4b339..0000000
--- a/graphite2-CVE-2017-5436.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1ce331d5548b98ed8b818532b2556d6f2c7a3b83 Mon Sep 17 00:00:00 2001
-From: Martin Hosken <martin_hosken@sil.org>
-Date: Thu, 9 Mar 2017 22:04:04 +0000
-Subject: [PATCH] Ensure features have enough space. Fix from Mozilla
-
----
- src/FeatureMap.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/FeatureMap.cpp b/src/FeatureMap.cpp
-index b8c8405..83bd5f6 100644
---- a/src/FeatureMap.cpp
-+++ b/src/FeatureMap.cpp
-@@ -275,7 +275,7 @@ bool FeatureRef::applyValToFeature(uint32 val, Features & pDest) const
-     else
-       if (pDest.m_pMap!=&m_pFace->theSill().theFeatureMap())
-         return false;       //incompatible
--    pDest.reserve(m_index);
-+    pDest.reserve(m_index+1);
-     pDest[m_index] &= ~m_mask;
-     pDest[m_index] |= (uint32(val) << m_bits);
-     return true;
-
diff --git a/graphite2.changes b/graphite2.changes
index 9bbb89b..eb9ad83 100644
--- a/graphite2.changes
+++ b/graphite2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun 21 19:13:30 UTC 2017 - tchvatal@suse.com
+
+- Use %ctest macro
+- Update license string to lgpl2.1+ and mpl2.0+
+- Remove patch graphite2-CVE-2017-5436.patch
+- Update to 1.3.10:
+  * Upstream marks this as contianing various bugfixes without
+    any specific mentions
+
 -------------------------------------------------------------------
 Mon Apr 24 07:22:01 UTC 2017 - pgajdos@suse.com
 
diff --git a/graphite2.spec b/graphite2.spec
index 27a4f32..16d39ca 100644
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -18,10 +18,10 @@
 
 %define libname libgraphite2-3
 Name:           graphite2
-Version:        1.3.9
+Version:        1.3.10
 Release:        0
 Summary:        Font rendering capabilities for complex non-Roman writing systems
-License:        LGPL-2.1+ or GPL-2.0+ or MPL-1.1
+License:        LGPL-2.1+ or MPL-2.0+
 Group:          Productivity/Publishing/Word
 Url:            https://github.com/silnrsi/graphite
 Source0:        https://github.com/silnrsi/graphite/archive/%{version}.tar.gz
@@ -29,7 +29,6 @@ Source1:        baselibs.conf
 Patch0:         graphite2-1.2.0-cmakepath.patch
 Patch1:         graphite-nonvoid-return.patch
 Patch2:         link-gcc-shared.diff
-Patch3:         graphite2-CVE-2017-5436.patch
 BuildRequires:  asciidoc
 BuildRequires:  cmake
 BuildRequires:  fontconfig-devel
@@ -83,7 +82,6 @@ This package contains the %{name} development files.
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3 -p1
 
 %build
 %cmake \
@@ -101,8 +99,7 @@ make %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-cd build
-ctest --output-on-failure
+%ctest
 
 %post -n %{libname} -p /sbin/ldconfig