From 820c62c9cb389468a6bce1f37a1dc4b3ef9f68e9708478e2ad91fcd2f02c494b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 11 Feb 2010 18:01:51 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/pcre revision 23.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcre?expand=0&rev=18897b582df9ac6015a6650e5ca5f37a --- pcre-7.9.dif | 36 ++++++++++++++++++++++++++++++++++++ pcre.changes | 6 ++++++ pcre.spec | 4 +++- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 pcre-7.9.dif diff --git a/pcre-7.9.dif b/pcre-7.9.dif new file mode 100644 index 0000000..7e299e8 --- /dev/null +++ b/pcre-7.9.dif @@ -0,0 +1,36 @@ +--- pcregexp.pas ++++ pcregexp.pas 2010/02/10 15:16:21 +@@ -7,7 +7,32 @@ + + The current PCRE version is: 3.7 + +- This software must be distributed as Freeware. ++ This software may be distributed under the terms of the modified BSD license ++ Copyright (c) 2001, Alexander Tokarev ++ All rights reserved. ++ ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are met: ++ ++ * Redistributions of source code must retain the above copyright notice, ++ this list of conditions and the following disclaimer. ++ * Redistributions in binary form must reproduce the above copyright notice, ++ this list of conditions and the following disclaimer in the documentation ++ and/or other materials provided with the distribution. ++ * Neither the name of the nor the names of its contributors ++ may be used to endorse or promote products derived from this software without ++ specific prior written permission. ++ ++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + The PCRE library is written by: Philip Hazel + Copyright (c) 1997-2004 University of Cambridge diff --git a/pcre.changes b/pcre.changes index 08191a8..2d9fd54 100644 --- a/pcre.changes +++ b/pcre.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 10 16:16:56 CET 2010 - ms@suse.de + +- fixed license statement according to the conversation + and permissions granted in (bnc #578724) + ------------------------------------------------------------------- Sat Dec 12 18:38:47 CET 2009 - jengelh@medozas.de diff --git a/pcre.spec b/pcre.spec index cede827..6bf8bdf 100644 --- a/pcre.spec +++ b/pcre.spec @@ -21,7 +21,7 @@ Name: pcre BuildRequires: gcc-c++ Version: 7.9.0 -Release: 3 +Release: 4 %define rversion 7.9 Summary: A library for Perl-compatible regular expressions License: BSD3c(or similar) ; Other uncritical OpenSource License @@ -35,6 +35,7 @@ Obsoletes: pcre-64bit Url: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ Source: %name-%rversion.tar.bz2 Source2: baselibs.conf +Patch: pcre-7.9.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -197,6 +198,7 @@ Authors: %prep %setup -q -n %name-%rversion +%patch %build %configure --disable-static \