From d1600be04490a0c8344cb7a0e914a74702c5027a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 17 Jan 2011 11:32:39 +0100 Subject: [PATCH] 8.12 bump --- .gitignore | 1 + pcre-8.11-Fix-typo-in-pcreprecompile-3.patch | 25 -------------------- pcre.spec | 9 +++---- sources | 2 +- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 pcre-8.11-Fix-typo-in-pcreprecompile-3.patch diff --git a/.gitignore b/.gitignore index 0928bb2..c8fe373 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ pcre-8.10.tar.bz2 /pcre-8.11.tar.bz2 +/pcre-8.12.tar.bz2 diff --git a/pcre-8.11-Fix-typo-in-pcreprecompile-3.patch b/pcre-8.11-Fix-typo-in-pcreprecompile-3.patch deleted file mode 100644 index 09377c6..0000000 --- a/pcre-8.11-Fix-typo-in-pcreprecompile-3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 688c7d4bff7da05f6b453a34f452ecd7c150a9eb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 13 Dec 2010 12:56:35 +0100 -Subject: [PATCH] Fix typo in pcreprecompile(3) - ---- - doc/pcreprecompile.3 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/doc/pcreprecompile.3 b/doc/pcreprecompile.3 -index c04af24..6b878fa 100644 ---- a/doc/pcreprecompile.3 -+++ b/doc/pcreprecompile.3 -@@ -24,7 +24,7 @@ guaranteed to work and may cause crashes. - . - .SH "SAVING A COMPILED PATTERN" - .rs --.sh -+.sp - The value returned by \fBpcre_compile()\fP points to a single block of memory - that holds the compiled pattern and associated data. You can find the length of - this block in bytes by calling \fBpcre_fullinfo()\fP with an argument of --- -1.7.3.3 - diff --git a/pcre.spec b/pcre.spec index d2b6bb7..645cc2b 100644 --- a/pcre.spec +++ b/pcre.spec @@ -1,11 +1,10 @@ Name: pcre -Version: 8.11 +Version: 8.12 Release: 1%{?dist} Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 Patch0: pcre-8.10-multilib.patch -Patch1: pcre-8.11-Fix-typo-in-pcreprecompile-3.patch License: BSD Group: System Environment/Libraries BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -39,8 +38,6 @@ Library for static linking for %{name}. %setup -q # Get rid of rpath %patch0 -p1 -b .multilib -# Fix manual -%patch1 -p1 -b .manual libtoolize --copy --force && autoreconf # One contributor's name is non-UTF-8 for F in ChangeLog; do @@ -106,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING LICENCE %changelog +* Mon Jan 17 2011 Petr Pisar - 8.12-1 +- 8.12 bump +- Remove accepted pcre-8.11-Fix-typo-in-pcreprecompile-3.patch + * Mon Dec 13 2010 Petr Pisar - 8.11-1 - 8.11 bump - See ChangeLog for changes. Namely changes have been made to the way diff --git a/sources b/sources index 4480187..195a6a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef907b8792ec7f90f0dcd773848f0b3b pcre-8.11.tar.bz2 +f14a9fef3c92f3fc6c5ac92d7a2c7eb3 pcre-8.12.tar.bz2