[pcre] 8.20-RC1 bump

Mon Sep 12 14:52:13 UTC 2011

commit 9ab62f88bdb4fdf775f50ec59e77d55a06f1d1cb
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Sep 12 16:51:37 2011 +0200

    8.20-RC1 bump

 .gitignore                                         |    1 +
 pcre-8.13-infinite_prune.patch                     |  115 --------------------
 pcre-8.13-named_class_tokenizer.patch              |   54 ---------
 ... => pcre-8.20-refused_spelling_terminated.patch |   23 ++--
 pcre.spec                                          |   25 ++---
 sources                                            |    2 +-
 6 files changed, 25 insertions(+), 195 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 8c916ad..d753876 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ pcre-8.10.tar.bz2
 /pcre-8.11.tar.bz2
 /pcre-8.12.tar.bz2
 /pcre-8.13.tar.bz2
+/pcre-8.20-RC1.tar.bz2
diff --git a/pcre-8.12-refused_spelling_terminated.patch b/pcre-8.20-refused_spelling_terminated.patch
similarity index 79%
rename from pcre-8.12-refused_spelling_terminated.patch
rename to pcre-8.20-refused_spelling_terminated.patch
index dd905ff..291c260 100644
--- a/pcre-8.12-refused_spelling_terminated.patch
+++ b/pcre-8.20-refused_spelling_terminated.patch
@@ -1,7 +1,7 @@
-From 4ba5f675be443041e5919cb125970f917a2326df Mon Sep 17 00:00:00 2001
+From a0530232f6ba0499bd14390fc54244fadd82b5d7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
 Date: Mon, 7 Feb 2011 11:37:09 +0100
-Subject: [PATCH 2/2] Fix spelling in pcretest(1) manual
+Subject: [PATCH] Fix spelling in pcretest(1) manual
 
 I kept some non-dictionary words to be consistent.
 Credits to John Bradshaw.
@@ -13,17 +13,15 @@ Collins dictionary of spelling and word division shows "termin-ate" and
 "termin-ating". I do know that there is a cultural difference between
 British and American hyphenation conventions; I try to follow the
 British ones, as exemplified in the Collins.
-
-
 ---
- doc/pcretest.1 |   22 +++++++++++-----------
- 1 files changed, 11 insertions(+), 11 deletions(-)
+ doc/pcretest.1 |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/doc/pcretest.1 b/doc/pcretest.1
-index c5d4fd6..c3266ab 100644
+index 2689bfa..cef1727 100644
 --- a/doc/pcretest.1
 +++ b/doc/pcretest.1
-@@ -361,8 +361,8 @@ recognized:
+@@ -413,8 +413,8 @@ recognized:
                 after a successful match (number less than 32)
  .\" JOIN
    \eCname     call pcre_copy_named_substring() for substring
@@ -34,7 +32,7 @@ index c5d4fd6..c3266ab 100644
  .\" JOIN
    \eC+        show the current captured substrings at callout
                 time
-@@ -383,8 +383,8 @@ recognized:
+@@ -435,8 +435,8 @@ recognized:
                 after a successful match (number less than 32)
  .\" JOIN
    \eGname     call pcre_get_named_substring() for substring
@@ -43,5 +41,8 @@ index c5d4fd6..c3266ab 100644
 +               "name" after a successful match (name terminated
 +               by next non-alphanumeric character)
  .\" JOIN
-   \eL         call pcre_get_substringlist() after a
-                successful match
+   \eJdd       set up a JIT stack of dd kilobytes maximum (any
+                number of digits)
+-- 
+1.7.6.1
+
diff --git a/pcre.spec b/pcre.spec
index 8b53576..b31f99d 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -1,20 +1,16 @@
+%global rcversion RC1
 Name: pcre
-Version: 8.13
-Release: 4%{?dist}
+Version: 8.20
+Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
+%global myversion %{version}%{?rcversion:-%rcversion}
 Summary: Perl-compatible regular expression library
 Group: System Environment/Libraries
 License: BSD
 URL: http://www.pcre.org/
-Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2
 Patch0: pcre-8.10-multilib.patch
 # Refused by upstream, bug #675477
-Patch1: pcre-8.12-refused_spelling_terminated.patch
-# Upstream bug #1136 fixed after 8.13, rhbz #732368
-Patch2: pcre-8.13-named_class_tokenizer.patch
-# Upstream bug
-# <https://lists.exim.org/lurker/message/20110904.203623.a32346f3.en.html>
-# fixed after 8.13, rhbz #735720
-Patch3: pcre-8.13-infinite_prune.patch
+Patch1: pcre-8.20-refused_spelling_terminated.patch
 BuildRequires: readline-devel
 # New libtool to get rid of rpath
 BuildRequires: autoconf, automake, libtool
@@ -50,13 +46,11 @@ Group: Development/Tools
 Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{myversion}
 # Get rid of rpath
 %patch0 -p1 -b .multilib
 libtoolize --copy --force && autoreconf
 %patch1 -p1 -b .terminated_typos
-%patch2 -p1 -b .named_class_tokenizer
-%patch3 -p0 -b .infinite_prune
 # One contributor's name is non-UTF-8
 for F in ChangeLog; do
     iconv -f latin1 -t utf8 "$F" >"${F}.utf8"
@@ -65,7 +59,7 @@ for F in ChangeLog; do
 done
 
 %build
-%configure --enable-pcretest-libreadline --enable-utf8 \
+%configure --enable-jit --enable-pcretest-libreadline --enable-utf8 \
     --enable-unicode-properties
 make %{?_smp_mflags}
 
@@ -118,6 +112,9 @@ make check
 %{_mandir}/man1/pcretest.*
 
 %changelog
+* Mon Sep 12 2011 Petr Pisar <ppisar at redhat.com> - 8.20-0.1.RC1
+- 8.20-RC1 bump with JIT
+
 * Tue Sep 06 2011 Petr Pisar <ppisar at redhat.com> - 8.13-4
 - Fix infinite matching PRUNE (bug #735720)
 
diff --git a/sources b/sources
index f27b004..5685eff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e595edbcded141813fa1a10dbce05cb  pcre-8.13.tar.bz2
+75d74012a49161b79ff2a32b462f3019  pcre-8.20-RC1.tar.bz2
