From a6258a8bc056cfbfd9915adc69101744d1c65379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 12 Dec 2011 16:31:28 +0100
Subject: [PATCH] 8.21 bump

---
 .gitignore                                    |  1 +
 ...-libs-cpp-aware-of-cross-compilation.patch | 25 -------------------
 pcre.spec                                     | 14 +++++------
 sources                                       |  2 +-
 4 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 pcre-8.21-Make-pcre-config-libs-cpp-aware-of-cross-compilation.patch

diff --git a/.gitignore b/.gitignore
index ca906c8..6109640 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pcre-8.10.tar.bz2
 /pcre-8.20-RC3.tar.bz2
 /pcre-8.20.tar.bz2
 /pcre-8.21-RC1.tar.bz2
+/pcre-8.21.tar.bz2
diff --git a/pcre-8.21-Make-pcre-config-libs-cpp-aware-of-cross-compilation.patch b/pcre-8.21-Make-pcre-config-libs-cpp-aware-of-cross-compilation.patch
deleted file mode 100644
index 9473d45..0000000
--- a/pcre-8.21-Make-pcre-config-libs-cpp-aware-of-cross-compilation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From abedf373e5a7032af6a37cc7f96aac15bf5c26dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 6 Dec 2011 19:13:31 +0100
-Subject: [PATCH] Make pcre-config --libs-cpp aware of cross-compilation
-
----
- pcre-config.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pcre-config.in b/pcre-config.in
-index aeee182..00c5395 100644
---- a/pcre-config.in
-+++ b/pcre-config.in
-@@ -58,7 +58,7 @@ while test $# -gt 0; do
-       ;;
-     --libs-cpp)
-       if test @enable_cpp@ = yes ; then
--        echo -L@libdir@$libR -lpcrecpp -lpcre
-+        echo $libS$libR -lpcrecpp -lpcre
-       else
-         echo "${usage}" 1>&2
-       fi
--- 
-1.7.7.4
-
diff --git a/pcre.spec b/pcre.spec
index 7ff9353..052acd9 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -1,8 +1,8 @@
 # This is stable release:
-%global rcversion RC1
+#%%global rcversion RC1
 Name: pcre
 Version: 8.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
@@ -11,10 +11,8 @@ URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2
 # Upstream thinks RPATH is good idea.
 Patch0: pcre-8.21-multilib.patch
-# Consolidate pcre-config --libs-cpp, in upstream after 8.21-RC1.
-Patch1: pcre-8.21-Make-pcre-config-libs-cpp-aware-of-cross-compilation.patch
 # Refused by upstream, bug #675477
-Patch2: pcre-8.20-refused_spelling_terminated.patch
+Patch1: pcre-8.20-refused_spelling_terminated.patch
 BuildRequires: readline-devel
 # New libtool to get rid of rpath
 BuildRequires: autoconf, automake, libtool
@@ -53,9 +51,8 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
 %setup -q -n %{name}-%{myversion}
 # Get rid of rpath
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .cpp
 libtoolize --copy --force && autoreconf
-%patch2 -p1 -b .terminated_typos
+%patch1 -p1 -b .terminated_typos
 # One contributor's name is non-UTF-8
 for F in ChangeLog; do
     iconv -f latin1 -t utf8 "$F" >"${F}.utf8"
@@ -126,6 +123,9 @@ make check
 %{_mandir}/man1/pcretest.*
 
 %changelog
+* Mon Dec 12 2011 Petr Pisar <ppisar@redhat.com> - 8.21-1
+- 8.21 bump
+
 * Thu Dec 08 2011 Karsten Hopp <karsten@redhat.com> 8.21-0.2.RC1
 - ppc needs a larger stack similar to s390
 
diff --git a/sources b/sources
index f6f6c08..a3215ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3aaead13e66d3ad4caa2795a2080e08e  pcre-8.21-RC1.tar.bz2
+0a7b592bea64b7aa7f4011fc7171a730  pcre-8.21.tar.bz2