From f9bd1beb43ee9575910b344e21566a9546b9b69d13cbafe055b408b0f3f88e95 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 20 Sep 2010 13:12:52 +0000 Subject: [PATCH] Accepting request 48509 from Base:System checked in (request 48509) OBS-URL: https://build.opensuse.org/request/show/48509 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcre?expand=0&rev=17 --- pcre-7.9.patch | 36 +++++++++++ pcre-7.9.tar.bz2 | 3 + pcre-8.10.tar.bz2 | 3 - pcre.changes | 47 -------------- pcre.spec | 160 +++++++++++++++++++++++++++++++--------------- 5 files changed, 149 insertions(+), 100 deletions(-) create mode 100644 pcre-7.9.patch create mode 100644 pcre-7.9.tar.bz2 delete mode 100644 pcre-8.10.tar.bz2 diff --git a/pcre-7.9.patch b/pcre-7.9.patch new file mode 100644 index 0000000..7e299e8 --- /dev/null +++ b/pcre-7.9.patch @@ -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-7.9.tar.bz2 b/pcre-7.9.tar.bz2 new file mode 100644 index 0000000..294a03c --- /dev/null +++ b/pcre-7.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646922f54b013c040dcd740 +size 861580 diff --git a/pcre-8.10.tar.bz2 b/pcre-8.10.tar.bz2 deleted file mode 100644 index c52bfd5..0000000 --- a/pcre-8.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:335025876d05a61d1aa6be3a854470a7780d5f707c4d2ad64953c484035d9e77 -size 964315 diff --git a/pcre.changes b/pcre.changes index ed76fa6..0ec98b0 100644 --- a/pcre.changes +++ b/pcre.changes @@ -1,50 +1,3 @@ -------------------------------------------------------------------- -Sun Sep 19 11:03:57 CEST 2010 - vuntz@opensuse.org - -- Update to version 8.10: - + Major additions: - - support for (*MARK) and friends - - PCRE_UCP option, which changes the behaviour of \b, \d, \s, - and \w (and their opposites) so that they make use of Unicode - properties - + Other additions: - - support for \N, which always matches any character other than - newline - - added --line-buffered to pcregrep - + Several small new features and bugfixes -- Changes from version 8.02: - + Update Unicode data tables to Unicode 5.2.0 - + Update the licensing terms in the pcregexp.pas file - + Several bug fixes -- Changes from version 8.01: - + Several bug fixes and build system improvements -- Changes from version 8.00: - + Enhancements: - - remove restrictions on patterns used for partial matching - - give extra information for partial matches - - improve the partial matching process - - add option to make a partial match override a full match - - enhance "study" process by finding a lower bound matching - length - - groups with duplicate numbers may now have duplicated names - without the use of PCRE_DUPNAMES, but they may not have - different names - - add REG_UNGREEDY to the pcreposix interface, which maps to - PCRE_UNGREEDY. - + Several bug fixes -- Drop pcre-7.9.patch: fixed upstream. -- Rearrange spec file to have all the %files sections together, as - well as all the scriptlets together. -- Kill the main package that only included doc files like AUTHORS, - NEWS, and license, and put those files in libpcre0: this really - makes more sense. Therefore, make libpcre0 Provides/Obsoletes - libpcre0. -- We can also remove the other dependencies on the main package, - since everything already depends on libpcre0. -- Remove AutoReqProv: it's default now. -- Remove references to perl 5.005 in descriptons: it's not - mentioned anywhere anymore upstream. - ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/pcre.spec b/pcre.spec index cd1fe2b..0758f09 100644 --- a/pcre.spec +++ b/pcre.spec @@ -1,5 +1,5 @@ # -# spec file for package pcre (Version 8.10) +# spec file for package pcre (Version 7.9.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,25 +20,35 @@ Name: pcre BuildRequires: gcc-c++ pkg-config -Version: 8.10 -Release: 1 +Version: 7.9.0 +Release: 7 +%define rversion 7.9 Summary: A library for Perl-compatible regular expressions License: BSD3c(or similar) ; Other uncritical OpenSource License Group: System/Libraries +AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: pcre-64bit %endif # Url: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ -Source: %name-%version.tar.bz2 +Source: %name-%rversion.tar.bz2 Source2: baselibs.conf +Patch: pcre-7.9.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The PCRE library is a set of functions that implement regular -expression pattern matching using the same syntax and semantics -as Perl 5. +expression pattern matching using the same syntax and semantics as Perl +5, with very few differences. The current implementation corresponds to +Perl 5.005. + + + +Authors: +-------- + Philip Hazel %package devel License: BSD3c(or similar) ; Other uncritical OpenSource License @@ -56,40 +66,96 @@ Obsoletes: pcre-devel-64bit %description devel The PCRE library is a set of functions that implement regular -expression pattern matching using the same syntax and semantics -as Perl 5. +expression pattern matching using the same syntax and semantics as Perl +5, with very few differences. The current implementation corresponds to +Perl 5.005. + + + +Authors: +-------- + Philip Hazel %package -n libpcre0 License: BSD3c(or similar) ; Other uncritical OpenSource License Summary: A library for Perl-compatible regular expressions Group: System/Libraries -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} +# for the license - don't add a version here! +Requires: %name > 7.9 %description -n libpcre0 The PCRE library is a set of functions that implement regular -expression pattern matching using the same syntax and semantics -as Perl 5. +expression pattern matching using the same syntax and semantics as Perl +5, with very few differences. The current implementation corresponds to +Perl 5.005. + + + +Authors: +-------- + Philip Hazel + +%post -n libpcre0 -p /sbin/ldconfig + +%postun -n libpcre0 -p /sbin/ldconfig + +%files -n libpcre0 +%defattr(-,root,root) +/%{_lib}/libpcre.so.* %package -n libpcreposix0 License: BSD3c(or similar) ; Other uncritical OpenSource License Summary: A library for Perl-compatible regular expressions Group: System/Libraries +# for the license - don't add a version here! +Requires: %name > 7.9 %description -n libpcreposix0 The PCRE library is a set of functions that implement regular -expression pattern matching using the same syntax and semantics -as Perl 5. +expression pattern matching using the same syntax and semantics as Perl +5, with very few differences. The current implementation corresponds to +Perl 5.005. + + + +Authors: +-------- + Philip Hazel + +%post -n libpcreposix0 -p /sbin/ldconfig + +%postun -n libpcreposix0 -p /sbin/ldconfig + +%files -n libpcreposix0 +%defattr(-,root,root) +/%{_lib}/libpcreposix.so.* %package -n libpcrecpp0 License: BSD3c(or similar) ; Other uncritical OpenSource License Summary: A library for Perl-compatible regular expressions Group: System/Libraries +# for the license - don't add a == version here! +Requires: %name > 7.9 %description -n libpcrecpp0 The PCRE library is a set of functions that implement regular -expression pattern matching using the same syntax and semantics -as Perl 5. +expression pattern matching using the same syntax and semantics as Perl +5, with very few differences. The current implementation corresponds to +Perl 5.005. + + + +Authors: +-------- + Philip Hazel + +%post -n libpcrecpp0 -p /sbin/ldconfig + +%postun -n libpcrecpp0 -p /sbin/ldconfig + +%files -n libpcrecpp0 +%defattr(-,root,root) +%{_libdir}/libpcrecpp.so.* %package doc License: BSD3c(or similar) ; Other uncritical OpenSource License @@ -101,22 +167,40 @@ BuildArch: noarch %description doc The PCRE library is a set of functions that implement regular -expression pattern matching using the same syntax and semantics -as Perl 5. +expression pattern matching using the same syntax and semantics as Perl +5, with very few differences. The current implementation corresponds to +Perl 5.005. + + + +Authors: +-------- + Philip Hazel %package tools License: BSD3c(or similar) ; Other uncritical OpenSource License Summary: A library for Perl-compatible regular expressions Group: System/Libraries Recommends: %{name}-doc +# 7.9 is < 7.9.0 (mls) +Obsoletes: %name <= 7.9 +Provides: %name <= 7.9 %description tools The PCRE library is a set of functions that implement regular -expression pattern matching using the same syntax and semantics -as Perl 5. +expression pattern matching using the same syntax and semantics as Perl +5, with very few differences. The current implementation corresponds to +Perl 5.005. + + + +Authors: +-------- + Philip Hazel %prep -%setup -q +%setup -q -n %name-%rversion +%patch %build %configure --disable-static \ @@ -128,9 +212,9 @@ as Perl 5. %{__make} %{?_smp_mflags} %install -%makeinstall +%{__make} DESTDIR=%{buildroot} install %{__mkdir_p} %{buildroot}/%{_defaultdocdir} -mv %{buildroot}/usr/share/doc/pcre %{buildroot}/%{_defaultdocdir}/pcre-doc +mv %{buildroot}/usr/share/doc/pcre %{buildroot}/%{_defaultdocdir}/pcre #empty dependecy_libs %{__rm} -f %{buildroot}%{_libdir}/*.la #move pcre and pcreposix library into /lib @@ -153,37 +237,15 @@ make test %clean %{__rm} -rf %{buildroot} -%post -n libpcre0 -p /sbin/ldconfig - -%postun -n libpcre0 -p /sbin/ldconfig - -%post -n libpcrecpp0 -p /sbin/ldconfig - -%postun -n libpcrecpp0 -p /sbin/ldconfig - -%post -n libpcreposix0 -p /sbin/ldconfig - -%postun -n libpcreposix0 -p /sbin/ldconfig - -%files -n libpcre0 +%files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog LICENCE NEWS README -/%{_lib}/libpcre.so.* - -%files -n libpcrecpp0 -%defattr(-,root,root) -%{_libdir}/libpcrecpp.so.* - -%files -n libpcreposix0 -%defattr(-,root,root) -/%{_lib}/libpcreposix.so.* +%doc AUTHORS COPYING ChangeLog INSTALL LICENCE NEWS NON-UNIX-USE README %files tools %defattr(-,root,root) %{_bindir}/pcregrep %{_bindir}/pcretest -%{_mandir}/man1/pcregrep.* -%{_mandir}/man1/pcretest.* +%{_mandir}/man1/*.gz %files doc %defattr(-,root,root) @@ -196,8 +258,6 @@ make test %{_libdir}/*.so %{_libdir}/pkgconfig/libpcre.pc %{_libdir}/pkgconfig/libpcrecpp.pc -%{_libdir}/pkgconfig/libpcreposix.pc -%{_mandir}/man1/pcre-config.* %{_mandir}/man3/*.gz %changelog