OBS User unknown 2007-04-30 16:14:19 +00:00 committed by Git OBS Bridge
parent 7917c53661
commit e18643e99b
3 changed files with 23 additions and 1 deletions

13
assert_fix.patch Normal file
View File

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

View File

@ -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 Wed Apr 25 13:39:55 CEST 2007 - ms@suse.de

View File

@ -13,13 +13,14 @@
Name: pcre Name: pcre
BuildRequires: gcc-c++ BuildRequires: gcc-c++
Version: 7.1 Version: 7.1
Release: 1 Release: 4
Summary: A library for Perl-compatible regular expressions Summary: A library for Perl-compatible regular expressions
License: BSD License and BSD-like, Other uncritical OpenSource License License: BSD License and BSD-like, Other uncritical OpenSource License
Group: System/Libraries Group: System/Libraries
Autoreqprov: on Autoreqprov: on
URL: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ URL: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
Patch0: assert_fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package devel %package devel
Summary: A library for Perl-compatible regular expressions Summary: A library for Perl-compatible regular expressions
@ -54,6 +55,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
@ -102,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT
%_mandir/man3/*.gz %_mandir/man3/*.gz
%changelog %changelog
* Mon Apr 30 2007 - trenn@suse.de
- corrected assert compile error
* Wed Apr 25 2007 - ms@suse.de * Wed Apr 25 2007 - ms@suse.de
- update to pcre 7.1 - update to pcre 7.1
1. Applied Bob Rossi and Daniel G's patches to convert the build system to one 1. Applied Bob Rossi and Daniel G's patches to convert the build system to one