[pcre] 8.30 bump

Petr Pisar ppisar at fedoraproject.org
Thu Feb 9 16:56:52 UTC 2012


commit c74eea56c9f6e8e0353a356dbc56035ddd090b12
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Feb 9 14:44:45 2012 +0100

    8.30 bump

 .gitignore                        |    1 +
 pcre-8.30-relative_symlinks.patch |   61 -------------------------------------
 pcre.spec                         |   12 ++++----
 sources                           |    2 +-
 4 files changed, 8 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6109640..1920ae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ pcre-8.10.tar.bz2
 /pcre-8.20.tar.bz2
 /pcre-8.21-RC1.tar.bz2
 /pcre-8.21.tar.bz2
+/pcre-8.30.tar.bz2
diff --git a/pcre.spec b/pcre.spec
index b36c029..8f13873 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -1,5 +1,5 @@
 # This is stable release:
-%global rcversion RC1
+#%%global rcversion RC1
 Name: pcre
 Version: 8.30
 Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
@@ -11,10 +11,8 @@ URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2
 # Upstream thinks RPATH is good idea.
 Patch0: pcre-8.21-multilib.patch
-# Use relative symlinks in for manual pages, submitted to upstream
-Patch1: pcre-8.30-relative_symlinks.patch
 # Refused by upstream, bug #675477
-Patch2: pcre-8.30-refused_spelling_terminated.patch
+Patch1: pcre-8.30-refused_spelling_terminated.patch
 BuildRequires: readline-devel
 # New libtool to get rid of rpath
 BuildRequires: autoconf, automake, libtool
@@ -53,9 +51,8 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
 %setup -q -n %{name}-%{myversion}
 # Get rid of rpath
 %patch0 -p1 -b .multilib
-%patch1 -p0 -b .relative_symlinks
 libtoolize --copy --force && autoreconf
-%patch2 -p1 -b .terminated_typos
+%patch1 -p1 -b .terminated_typos
 # One contributor's name is non-UTF-8
 for F in ChangeLog; do
     iconv -f latin1 -t utf8 "$F" >"${F}.utf8"
@@ -127,6 +124,9 @@ make check
 %{_mandir}/man1/pcretest.*
 
 %changelog
+* Thu Feb 09 2012 Petr Pisar <ppisar at redhat.com> - 8.30-1
+- 8.30 bump
+
 * Fri Jan 27 2012 Petr Pisar <ppisar at redhat.com> - 8.30-0.1.RC1
 - 8.30 Relase candidate 1 with UTF-16 bump
 - Enable UTF-16 variant of PCRE library
diff --git a/sources b/sources
index a3215ee..b3207ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a7b592bea64b7aa7f4011fc7171a730  pcre-8.21.tar.bz2
+98e8928cccc945d04279581e778fbdff  pcre-8.30.tar.bz2


More information about the scm-commits mailing list