From dc569425ccb720ac1501795db307d625caf7ea53 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 12 Feb 2018 13:40:07 +0100
Subject: [PATCH] Update to 10.31

---
 .gitignore                     |  1 +
 mingw-pcre2.spec               |  7 +++++--
 pcre2-10.10-Fix-multilib.patch | 22 +++-------------------
 pcre2-10.23-mingw.patch        |  8 ++++----
 sources                        |  2 +-
 5 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8858cd6..5dbc16b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /pcre2-10.23.tar.bz2
 /pcre2-10.30.tar.bz2
+/pcre2-10.31.tar.bz2
diff --git a/mingw-pcre2.spec b/mingw-pcre2.spec
index e0b656e..c8526e3 100644
--- a/mingw-pcre2.spec
+++ b/mingw-pcre2.spec
@@ -3,8 +3,8 @@
 %global pkgname pcre2
 
 Name:          mingw-%{pkgname}
-Version:       10.30
-Release:       2%{?dist}
+Version:       10.31
+Release:       1%{?dist}
 Summary:       MinGW Windows %{pkgname} library
 
 License:       BSD
@@ -179,6 +179,9 @@ chmod 0644 %{buildroot}%{mingw64_libdir}/*.dll.a
 
 
 %changelog
+* Mon Feb 12 2018 Sandro Mani <manisandro@gmail.com> - 10.31-1
+- Update to 10.31
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/pcre2-10.10-Fix-multilib.patch b/pcre2-10.10-Fix-multilib.patch
index 89c7d80..0981f68 100644
--- a/pcre2-10.10-Fix-multilib.patch
+++ b/pcre2-10.10-Fix-multilib.patch
@@ -1,19 +1,6 @@
-From 8b6b10229201e5b148979a24e06c640dbbcfbad9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 20 Feb 2015 14:34:26 +0100
-Subject: [PATCH] Fix multilib
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Do not set RPATH nor add explicit -L path to compiler.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
-
-diff --git a/pcre2-config.in b/pcre2-config.in
-index 932160e..dbef5e5 100644
---- a/pcre2-config.in
-+++ b/pcre2-config.in
+diff -rupN pcre2-10.31/pcre2-config.in pcre2-10.31-new/pcre2-config.in
+--- pcre2-10.31/pcre2-config.in	2016-11-22 10:54:06.000000000 +0100
++++ pcre2-10.31-new/pcre2-config.in	2018-02-12 13:30:25.132956848 +0100
 @@ -28,19 +28,7 @@ if test $# -eq 0; then
  fi
  
@@ -34,6 +21,3 @@ index 932160e..dbef5e5 100644
  
  while test $# -gt 0; do
    case "$1" in
--- 
-2.1.0
-
diff --git a/pcre2-10.23-mingw.patch b/pcre2-10.23-mingw.patch
index aebe2c7..9d424a7 100644
--- a/pcre2-10.23-mingw.patch
+++ b/pcre2-10.23-mingw.patch
@@ -1,7 +1,7 @@
-diff -rupN pcre2-10.23/src/pcre2grep.c pcre2-10.23-new/src/pcre2grep.c
---- pcre2-10.23/src/pcre2grep.c	2017-02-12 14:29:54.000000000 +0100
-+++ pcre2-10.23-new/src/pcre2grep.c	2017-06-14 11:00:01.766518945 +0200
-@@ -628,7 +628,7 @@ z/OS, and "no support". */
+diff -rupN pcre2-10.31/src/pcre2grep.c pcre2-10.31-new/src/pcre2grep.c
+--- pcre2-10.31/src/pcre2grep.c	2017-12-26 15:57:04.000000000 +0100
++++ pcre2-10.31-new/src/pcre2grep.c	2018-02-12 13:30:25.159956847 +0100
+@@ -720,7 +720,7 @@ native z/OS, and "no support". */
  
  /************* Directory scanning Unix-style and z/OS ***********/
  
diff --git a/sources b/sources
index 2c9967a..a0e24ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcre2-10.30.tar.bz2) = f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
+SHA512 (pcre2-10.31.tar.bz2) = 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967