From e18643e99bc4291cf1659a9d27aebc0cc37964437c74681b40c4a410bfdab645 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 30 Apr 2007 16:14:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcre?expand=0&rev=6 --- assert_fix.patch | 13 +++++++++++++ pcre.changes | 5 +++++ pcre.spec | 6 +++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 assert_fix.patch diff --git a/assert_fix.patch b/assert_fix.patch new file mode 100644 index 0000000..9ecb0bf --- /dev/null +++ b/assert_fix.patch @@ -0,0 +1,13 @@ +Index: pcre-7.1/pcrecpp.cc +=================================================================== +--- pcre-7.1.orig/pcrecpp.cc ++++ pcre-7.1/pcrecpp.cc +@@ -360,7 +360,7 @@ static int NewlineMode(int pcre_options) + else if (newline == 3338) + newline_mode = PCRE_NEWLINE_CRLF; + else +- assert("" == "Unexpected return value from pcre_config(NEWLINE)"); ++ assert("Unexpected return value from pcre_config(NEWLINE)"); + } + return newline_mode; + } diff --git a/pcre.changes b/pcre.changes index b94c2dc..b51d950 100644 --- a/pcre.changes +++ b/pcre.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 30 10:12:10 CEST 2007 - trenn@suse.de + +- corrected assert compile error + ------------------------------------------------------------------- Wed Apr 25 13:39:55 CEST 2007 - ms@suse.de diff --git a/pcre.spec b/pcre.spec index 1b74209..4e2105d 100644 --- a/pcre.spec +++ b/pcre.spec @@ -13,13 +13,14 @@ Name: pcre BuildRequires: gcc-c++ Version: 7.1 -Release: 1 +Release: 4 Summary: A library for Perl-compatible regular expressions License: BSD License and BSD-like, Other uncritical OpenSource License Group: System/Libraries Autoreqprov: on URL: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ Source: %name-%version.tar.bz2 +Patch0: assert_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel Summary: A library for Perl-compatible regular expressions @@ -54,6 +55,7 @@ Authors: %prep %setup -q +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" @@ -102,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT %_mandir/man3/*.gz %changelog +* Mon Apr 30 2007 - trenn@suse.de +- corrected assert compile error * Wed Apr 25 2007 - ms@suse.de - update to pcre 7.1 1. Applied Bob Rossi and Daniel G's patches to convert the build system to one