Update to 8.31

and dropped the patch as it doesn't have any effect on the mingw target
This commit is contained in:
Erik van Pienbroek 2012-11-21 23:37:25 +01:00
parent 4d9e514b06
commit 9f0b73c9c3
4 changed files with 8 additions and 48 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/pcre-8.10.tar.gz /pcre-8.10.tar.gz
/pcre-8.30.tar.gz /pcre-8.30.tar.gz
/pcre-8.31.tar.gz

View File

@ -1,15 +1,14 @@
%?mingw_package_header %?mingw_package_header
Name: mingw-pcre Name: mingw-pcre
Version: 8.30 Version: 8.31
Release: 2%{?dist} Release: 1%{?dist}
Summary: MinGW Windows pcre library Summary: MinGW Windows pcre library
Group: Development/Libraries Group: Development/Libraries
License: BSD License: BSD
URL: http://www.pcre.org/ URL: http://www.pcre.org/
Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.gz Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.gz
Patch0: pcre-8.21-multilib.patch
BuildArch: noarch BuildArch: noarch
@ -25,9 +24,6 @@ BuildRequires: mingw64-gcc
BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-gcc-c++
BuildRequires: mingw64-binutils BuildRequires: mingw64-binutils
# New libtool to get rid of rpath
BuildRequires: autoconf, automake, libtool
%description %description
Cross compiled Perl-compatible regular expression library for use with mingw32. 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 %prep
%setup -q -n pcre-%{version} %setup -q -n pcre-%{version}
# Get rid of rpath
%patch0 -p1 -b .multilib
libtoolize --copy --force && autoreconf
%build %build
%mingw_configure --enable-utf8 --enable-unicode-properties --disable-static %mingw_configure --enable-utf8 --enable-unicode-properties --disable-static
@ -120,6 +112,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog %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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

View File

@ -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

View File

@ -1 +1 @@
d5ee0d9f6d2f0b7489331d04b6c182ef pcre-8.30.tar.gz fab1bb3b91a4c35398263a5c1e0858c1 pcre-8.31.tar.gz