From 9f0b73c9c3edb810ed85d1ce037802e6a2f211bb Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Wed, 21 Nov 2012 23:37:25 +0100
Subject: [PATCH] Update to 8.31

and dropped the patch as it doesn't have any effect on the mingw target
---
 .gitignore               |  1 +
 mingw-pcre.spec          | 16 ++++++----------
 pcre-8.21-multilib.patch | 37 -------------------------------------
 sources                  |  2 +-
 4 files changed, 8 insertions(+), 48 deletions(-)
 delete mode 100644 pcre-8.21-multilib.patch

diff --git a/.gitignore b/.gitignore
index 82bc7d5..85d6be9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /pcre-8.10.tar.gz
 /pcre-8.30.tar.gz
+/pcre-8.31.tar.gz
diff --git a/mingw-pcre.spec b/mingw-pcre.spec
index c4e1e5b..59a98da 100644
--- a/mingw-pcre.spec
+++ b/mingw-pcre.spec
@@ -1,15 +1,14 @@
 %?mingw_package_header
 
 Name:		mingw-pcre
-Version:	8.30
-Release:	2%{?dist}
+Version:	8.31
+Release:	1%{?dist}
 Summary:	MinGW Windows pcre library
 
 Group:		Development/Libraries
 License:	BSD
 URL:		http://www.pcre.org/
 Source0:	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.gz
-Patch0:		pcre-8.21-multilib.patch
 
 BuildArch:	noarch
 
@@ -25,9 +24,6 @@ BuildRequires:  mingw64-gcc
 BuildRequires:  mingw64-gcc-c++
 BuildRequires:  mingw64-binutils
 
-# New libtool to get rid of rpath
-BuildRequires: autoconf, automake, libtool
-
 
 %description
 Cross compiled Perl-compatible regular expression library for use with mingw32.
@@ -74,10 +70,6 @@ for the POSIX-style functions is called pcreposix.h.
 %prep
 %setup -q -n pcre-%{version}
 
-# Get rid of rpath
-%patch0 -p1 -b .multilib
-libtoolize --copy --force && autoreconf
-
 
 %build
 %mingw_configure --enable-utf8 --enable-unicode-properties --disable-static
@@ -120,6 +112,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Wed Nov 21 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 8.31-1
+- Update to 8.31
+- Dropped patch as it doesn't have any effect on the mingw target
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/pcre-8.21-multilib.patch b/pcre-8.21-multilib.patch
deleted file mode 100644
index 345e624..0000000
--- a/pcre-8.21-multilib.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1d5ce3e2e6341b01609aefab20786a8638fee17a 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 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@libdir@"
--  ;;
--  *BSD*)
--  libR=" -Wl,-R@libdir@"
--  ;;
--esac
--
- libS=
--if test @libdir@ != /usr/lib ; then
--  libS=-L@libdir@
--fi
- 
- while test $# -gt 0; do
-   case "$1" in
--- 
-1.7.7.4
-
diff --git a/sources b/sources
index 4122025..55fdb2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5ee0d9f6d2f0b7489331d04b6c182ef  pcre-8.30.tar.gz
+fab1bb3b91a4c35398263a5c1e0858c1  pcre-8.31.tar.gz