From 0985ca53fbf43f40a9e18017d8e9675ac869f8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 19 Oct 2016 13:25:41 +0200 Subject: [PATCH] Fix internal option documentation in pcre2pattern(3) --- pcre2-10.22-Fix-documentation-error.patch | 39 +++++++++++++++++++++++ pcre2.spec | 5 +++ 2 files changed, 44 insertions(+) create mode 100644 pcre2-10.22-Fix-documentation-error.patch diff --git a/pcre2-10.22-Fix-documentation-error.patch b/pcre2-10.22-Fix-documentation-error.patch new file mode 100644 index 0000000..327e402 --- /dev/null +++ b/pcre2-10.22-Fix-documentation-error.patch @@ -0,0 +1,39 @@ +From 8e64a87e1ee27f4e1ac96d97634d1e52d1f33953 Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Fri, 14 Oct 2016 17:06:34 +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/pcre2/code/trunk@569 6239d852-aaf2-0410-a92c-79f79f948069 + +Petr Písař: Ported to 10.22. + +Signed-off-by: Petr Písař +--- + doc/pcre2pattern.3 | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/doc/pcre2pattern.3 b/doc/pcre2pattern.3 +index 36318cf..57b0014 100644 +--- a/doc/pcre2pattern.3 ++++ b/doc/pcre2pattern.3 +@@ -1550,12 +1550,8 @@ 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, PCRE2 +-extracts it into the global options (and it will therefore show up in data +-extracted by the \fBpcre2_pattern_info()\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 +-- +2.7.4 + diff --git a/pcre2.spec b/pcre2.spec index b014009..6ed8f7a 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -40,6 +40,9 @@ Patch5: pcre2-10.22-Fix-bad-conditional-recursion-test-bug-when-a-group-.pat # 2/2 Tests for Fix-bad-conditional-recursion-test-bug-when-a-group-.patch, # in upstream after 10.22, upstream bug #1873 Patch6: pcre2-10.22-Add-test-for-bug-already-fixed-by-the-refactoring.patch +# Fix internal option documentation in pcre2pattern(3), in upstream after 10.22, +# upstream bug #1875 +Patch7: pcre2-10.22-Fix-documentation-error.patch # New libtool to get rid of RPATH and to use distribution autotools BuildRequires: autoconf BuildRequires: automake @@ -123,6 +126,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # Because of multilib patch libtoolize --copy --force autoreconf -vif @@ -225,6 +229,7 @@ make %{?_smp_mflags} check VERBOSE=yes - Fix pcrepattern(3) documentation - Fix miscopmilation of conditionals when a group name start with "R" (upstream bug #1873) +- Fix internal option documentation in pcre2pattern(3) (upstream bug #1875) * Mon Aug 29 2016 Petr Pisar - 10.22-2 - Fix matching characters above 255 when a negative character type was used