Adapt a test to French locale on RHEL

pcre2-10.21-RC1-Add-a-trailing-space-to-testdata-testoutput3-for-RHE.patch

@@ -0,0 +1,33 @@
+From db3b9ca6555fa002eaee742fa650665d16b4eec2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 6 Jan 2016 12:42:11 +0100
+Subject: [PATCH] Add a trailing space to testdata/testoutput3 for RHEL-7
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Frech locale test 3 is expected to match testdata/testoutput3 on
+RHEL-7 glibc. But it's missing a trailing space that was added into
+testdata/testoutput3A only.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ testdata/testoutput3 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testdata/testoutput3 b/testdata/testoutput3
+index d9e8c5c..77e3d75 100644
+--- a/testdata/testoutput3
++++ b/testdata/testoutput3
+@@ -104,7 +104,7 @@ Subject length lower bound = 1
+ /^[\xc8-\xc9]/
+     École
+  0: É
+-\= Expect no match
++\= Expect no match 
+     école
+ No match
+ 
+-- 
+2.5.0
+

pcre2.spec

@@ -2,7 +2,7 @@
 %global rcversion RC1
 Name:       pcre2
 Version:    10.21
-Release:    %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
+Release:    %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist}
 %global     myversion %{version}%{?rcversion:-%rcversion}
 Summary:    Perl-compatible regular expression library
 Group:      System Environment/Libraries
@@ -18,6 +18,9 @@ URL:        http://www.pcre.org/
 Source:     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2
 # Do no set RPATH if libdir is not /usr/lib
 Patch0:     pcre2-10.10-Fix-multilib.patch
+# Adapt a test to French locale on RHEL, submitted to upstream
+# <https://lists.exim.org/lurker/message/20160106.115714.660924b0.en.html>
+Patch1:     pcre2-10.21-RC1-Add-a-trailing-space-to-testdata-testoutput3-for-RHE.patch
 
 # New libtool to get rid of RPATH and to use distribution autotools
 BuildRequires:  autoconf
@@ -78,6 +81,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
 %prep
 %setup -q -n %{name}-%{myversion}
 %patch0 -p1
+%patch1 -p1
 # Because of multilib patch
 libtoolize --copy --force
 autoreconf -vif
@@ -157,6 +161,9 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcre2test.*
 
 %changelog
+* Wed Jan 06 2016 Petr Pisar <ppisar@redhat.com> - 10.21-0.2.RC1
+- Adapt a test to French locale on RHEL
+
 * Tue Jan 05 2016 Petr Pisar <ppisar@redhat.com> - 10.21-0.1.RC1
 - 10.21-RC1 bump