diff --git a/pcre-8.39-Fix-documentation-error.patch b/pcre-8.39-Fix-documentation-error.patch new file mode 100644 index 0000000..7efbe1d --- /dev/null +++ b/pcre-8.39-Fix-documentation-error.patch @@ -0,0 +1,51 @@ +From bad0d0347aa4ab37d2b3e906193725d68a5d98bf Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Fri, 14 Oct 2016 17:06:22 +0000 +Subject: [PATCH] Fix documentation error. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1668 2f5784b3-3f2a-0410-8824-cb99058d5e15 +Signed-off-by: Petr Písař +--- + doc/pcrepattern.3 | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +diff --git a/doc/pcrepattern.3 b/doc/pcrepattern.3 +index 952451f..1e25371 100644 +--- a/doc/pcrepattern.3 ++++ b/doc/pcrepattern.3 +@@ -1,4 +1,4 @@ +-.TH PCREPATTERN 3 "14 June 2015" "PCRE 8.38" ++.TH PCREPATTERN 3 "14 October 2016" "PCRE 8.40" + .SH NAME + PCRE - Perl-compatible regular expressions + .SH "PCRE REGULAR EXPRESSION DETAILS" +@@ -1511,12 +1511,8 @@ J, U and X respectively. + .P + When one of these option changes occurs at top level (that is, not inside + subpattern parentheses), the change applies to the remainder of the pattern +-that follows. If the change is placed right at the start of a pattern, PCRE +-extracts it into the global options (and it will therefore show up in data +-extracted by the \fBpcre_fullinfo()\fP function). +-.P +-An option change within a subpattern (see below for a description of +-subpatterns) affects only that part of the subpattern that follows it, so ++that follows. An option change within a subpattern (see below for a description ++of subpatterns) affects only that part of the subpattern that follows it, so + .sp + (a(?i)b)c + .sp +@@ -3296,6 +3292,6 @@ Cambridge CB2 3QH, England. + .rs + .sp + .nf +-Last updated: 14 June 2015 +-Copyright (c) 1997-2015 University of Cambridge. ++Last updated: 14 October 2016 ++Copyright (c) 1997-2016 University of Cambridge. + .fi +-- +2.7.4 + diff --git a/pcre.spec b/pcre.spec index a962c1b..e5eb0b8 100644 --- a/pcre.spec +++ b/pcre.spec @@ -2,7 +2,7 @@ #%%global rcversion RC1 Name: pcre Version: 8.39 -Release: %{?rcversion:0.}4%{?rcversion:.%rcversion}%{?dist} +Release: %{?rcversion:0.}4%{?rcversion:.%rcversion}%{?dist}.1 %global myversion %{version}%{?rcversion:-%rcversion} Summary: Perl-compatible regular expression library Group: System Environment/Libraries @@ -53,6 +53,9 @@ Patch6: pcre-8.39-Fix-typos-in-documentation.patch # Fix miscopmilation of conditionals when a group name start with "R", # in upstream after 8.39, upstream bug #1873 Patch7: pcre-8.39-Fix-bad-conditional-recursion-test-bug-when-a-group-.patch +# Fix internal option documentation in pcrepattern(3), in upstream after 8.39, +# upstream bug #1875 +Patch8: pcre-8.39-Fix-documentation-error.patch BuildRequires: readline-devel BuildRequires: autoconf BuildRequires: automake @@ -110,6 +113,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # Because of rpath patch libtoolize --copy --force autoreconf -vif @@ -181,6 +185,9 @@ make %{?_smp_mflags} check VERBOSE=yes %{_mandir}/man1/pcretest.* %changelog +* Wed Oct 19 2016 Petr Pisar - 8.39-4.1 +- Fix internal option documentation in pcrepattern(3) (upstream bug #1875) + * Fri Oct 14 2016 Petr Pisar - 8.39-4 - Fix displaying position in pcretest callout with an escape sequence greater than \x{ff}