diff --git a/pcre-7.9.dif b/pcre-7.9.dif deleted file mode 100644 index 7e299e8..0000000 --- a/pcre-7.9.dif +++ /dev/null @@ -1,36 +0,0 @@ ---- 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 2d9fd54..08191a8 100644 --- a/pcre.changes +++ b/pcre.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 f398d13..cede827 100644 --- a/pcre.spec +++ b/pcre.spec @@ -35,7 +35,6 @@ 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 @@ -198,7 +197,6 @@ Authors: %prep %setup -q -n %name-%rversion -%patch %build %configure --disable-static \