[pcre] 8.21-RC1 bump
Petr Pisar
ppisar at fedoraproject.org
Tue Dec 6 18:30:28 UTC 2011
commit 20e607628ae47b1ca81152f43eedd2a2c5884055
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Dec 6 19:29:30 2011 +0100
8.21-RC1 bump
.gitignore | 1 +
pcre-8.10-multilib.patch | 38 --
pcre-8.20-caseless_different_length.patch | 150 ------
pcre-8.20-forward_reference.patch | 69 ---
pcre-8.20-lookbehind-2.patch | 473 --------------------
pcre-8.20-lookbehind.patch | 84 ----
pcre-8.20-ppcjit.patch | 112 -----
...onfig-libs-cpp-aware-of-cross-compilation.patch | 25 +
pcre-8.21-multilib.patch | 37 ++
pcre.spec | 36 +-
sources | 2 +-
11 files changed, 78 insertions(+), 949 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb2c96b..ca906c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pcre-8.10.tar.bz2
/pcre-8.20-RC2.tar.bz2
/pcre-8.20-RC3.tar.bz2
/pcre-8.20.tar.bz2
+/pcre-8.21-RC1.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
new file mode 100644
index 0000000..9473d45
--- /dev/null
+++ b/pcre-8.21-Make-pcre-config-libs-cpp-aware-of-cross-compilation.patch
@@ -0,0 +1,25 @@
+From abedf373e5a7032af6a37cc7f96aac15bf5c26dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at 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 at libdir@$libR -lpcrecpp -lpcre
++ echo $libS$libR -lpcrecpp -lpcre
+ else
+ echo "${usage}" 1>&2
+ fi
+--
+1.7.7.4
+
diff --git a/pcre-8.21-multilib.patch b/pcre-8.21-multilib.patch
new file mode 100644
index 0000000..345e624
--- /dev/null
+++ b/pcre-8.21-multilib.patch
@@ -0,0 +1,37 @@
+From 1d5ce3e2e6341b01609aefab20786a8638fee17a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 6 Dec 2011 18:44:11 +0100
+Subject: [PATCH] Fix multilib
+
+Do not set RPATH nor add explicit -L path to compiler.
+---
+ pcre-config.in | 12 ------------
+ 1 files changed, 0 insertions(+), 12 deletions(-)
+
+diff --git a/pcre-config.in b/pcre-config.in
+index ccbf210..aeee182 100644
+--- a/pcre-config.in
++++ b/pcre-config.in
+@@ -16,19 +16,7 @@ if test $# -eq 0; then
+ fi
+
+ libR=
+-case `uname -s` in
+- *SunOS*)
+- libR=" -R at libdir@"
+- ;;
+- *BSD*)
+- libR=" -Wl,-R at libdir@"
+- ;;
+-esac
+-
+ libS=
+-if test @libdir@ != /usr/lib ; then
+- libS=-L at libdir@
+-fi
+
+ while test $# -gt 0; do
+ case "$1" in
+--
+1.7.7.4
+
diff --git a/pcre.spec b/pcre.spec
index 280f0cf..814a113 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -1,27 +1,20 @@
-# This is stable release: %%global rcversion RC3
+# This is stable release:
+%global rcversion RC1
Name: pcre
-Version: 8.20
-Release: %{?rcversion:0.}7%{?rcversion:.%rcversion}%{?dist}
+Version: 8.21
+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}/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2
-Patch0: pcre-8.10-multilib.patch
+# Upstream thinks RPATH is good idea.
+Patch0: pcre-8.21-multilib.patch
+# Consolidate pcre-config --libs-cpp, sent to upstream.
+Patch1: pcre-8.21-Make-pcre-config-libs-cpp-aware-of-cross-compilation.patch
# Refused by upstream, bug #675477
-Patch1: pcre-8.20-refused_spelling_terminated.patch
-# Fix look-behind regression, in upstream after 8.20.
-Patch2: pcre-8.20-lookbehind.patch
-# Fix other look-behind regression, in upstream after 8.20.
-Patch3: pcre-8.20-lookbehind-2.patch
-# Fix repeated forward reference, in upstream after 8.20.
-Patch4: pcre-8.20-forward_reference.patch
-# Fix cache-flush in JIT on PPC, in upstream after 8.20.
-Patch5: pcre-8.20-ppcjit.patch
-# Fix case-less match if cases differ in encoding length, in upstream after
-# 8.20.
-Patch6: pcre-8.20-caseless_different_length.patch
+Patch2: pcre-8.20-refused_spelling_terminated.patch
BuildRequires: readline-devel
# New libtool to get rid of rpath
BuildRequires: autoconf, automake, libtool
@@ -60,13 +53,9 @@ 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
-%patch1 -p1 -b .terminated_typos
-%patch2 -p1 -b .lookbehind
-%patch3 -p1 -b .lookbehind2
-%patch4 -p0 -b .forward_reference
-%patch5 -p0 -b .ppcjit
-%patch6 -p1 -b .caseless_different_length
+%patch2 -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"
@@ -137,6 +126,9 @@ make check
%{_mandir}/man1/pcretest.*
%changelog
+* Tue Dec 06 2011 Petr Pisar <ppisar at redhat.com> - 8.21-0.1.RC1
+- 8.21-RC1 bump
+
* Fri Dec 02 2011 Petr Pisar <ppisar at redhat.com> - 8.20-7
- Fix case-less match if cases differ in encoding length (bug #756675)
diff --git a/sources b/sources
index 0e7ae60..f6f6c08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1931c70e1273e3450d5036fe273d25c pcre-8.20.tar.bz2
+3aaead13e66d3ad4caa2795a2080e08e pcre-8.21-RC1.tar.bz2
More information about the scm-commits
mailing list