diff --git a/.gitignore b/.gitignore index 2ff563e..814c91d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pcre2-10.20-RC1.tar.bz2 /pcre2-10.20.tar.bz2 /pcre2-10.21-RC1.tar.bz2 +/pcre2-10.21.tar.bz2 diff --git a/pcre2-10.21-RC1-Add-a-trailing-space-to-testdata-testoutput3-for-RHE.patch b/pcre2-10.21-RC1-Add-a-trailing-space-to-testdata-testoutput3-for-RHE.patch deleted file mode 100644 index a3c0ad9..0000000 --- a/pcre2-10.21-RC1-Add-a-trailing-space-to-testdata-testoutput3-for-RHE.patch +++ /dev/null @@ -1,33 +0,0 @@ -From db3b9ca6555fa002eaee742fa650665d16b4eec2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -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Å™ ---- - 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 - diff --git a/pcre2.spec b/pcre2.spec index 9c87f00..2acc223 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -1,26 +1,25 @@ -# This is not stable release: -%global rcversion RC1 +# This is stable release: +#%%global rcversion RC1 Name: pcre2 Version: 10.21 -Release: %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist} +Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist} %global myversion %{version}%{?rcversion:-%rcversion} Summary: Perl-compatible regular expression library Group: System Environment/Libraries # the library: BSD # pcre2test (linked to GNU readline): BSD (linked to GPLv3+) -# COPYING: GPLv3 text (a mistake -# ) +# COPYING: see LICENCE file +# LICENSE: BSD text and declares Public Domain +# for testdata #Not distributed in binary package # autotools: GPLv3+ with exception # install-sh: MIT +# testdata: Public Domain License: BSD 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 -# -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 @@ -81,7 +80,6 @@ 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 @@ -161,6 +159,9 @@ make %{?_smp_mflags} check VERBOSE=yes %{_mandir}/man1/pcre2test.* %changelog +* Tue Jan 12 2016 Petr Pisar - 10.21-1 +- 10.21 bump + * Wed Jan 06 2016 Petr Pisar - 10.21-0.2.RC1 - Adapt a test to French locale on RHEL diff --git a/sources b/sources index cf40176..f99b045 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61ef4bd487c7a207ff64f10bfe87744c pcre2-10.21-RC1.tar.bz2 +e79460519f916e3fcb204e59714bfd4a pcre2-10.21.tar.bz2