From c74eea56c9f6e8e0353a356dbc56035ddd090b12 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Feb 09 2012 13:44:45 +0000 Subject: 8.30 bump --- 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-8.30-relative_symlinks.patch b/pcre-8.30-relative_symlinks.patch deleted file mode 100644 index 4e5a68a..0000000 --- a/pcre-8.30-relative_symlinks.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: Makefile.am -=================================================================== ---- Makefile.am (revision 906) -+++ Makefile.am (working copy) -@@ -521,31 +521,31 @@ - - # Arrange for the per-function man pages to have 16-bit names as well. - install-data-hook: -- ln -s $(DESTDIR)$(man3dir)/pcre_assign_jit_stack.3 $(DESTDIR)$(man3dir)/pcre16_assign_jit_stack.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_compile.3 $(DESTDIR)$(man3dir)/pcre16_compile.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_compile2.3 $(DESTDIR)$(man3dir)/pcre16_compile2.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_config.3 $(DESTDIR)$(man3dir)/pcre16_config.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_copy_named_substring.3 $(DESTDIR)$(man3dir)/pcre16_copy_named_substring.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_copy_substring.3 $(DESTDIR)$(man3dir)/pcre16_copy_substring.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_dfa_exec.3 $(DESTDIR)$(man3dir)/pcre16_dfa_exec.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_exec.3 $(DESTDIR)$(man3dir)/pcre16_exec.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_free_study.3 $(DESTDIR)$(man3dir)/pcre16_free_study.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_free_substring.3 $(DESTDIR)$(man3dir)/pcre16_free_substring.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_free_substring_list.3 $(DESTDIR)$(man3dir)/pcre16_free_substring_list.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_fullinfo.3 $(DESTDIR)$(man3dir)/pcre16_fullinfo.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_get_named_substring.3 $(DESTDIR)$(man3dir)/pcre16_get_named_substring.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_get_stringnumber.3 $(DESTDIR)$(man3dir)/pcre16_get_stringnumber.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_get_stringtable_entries.3 $(DESTDIR)$(man3dir)/pcre16_get_stringtable_entries.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_get_substring.3 $(DESTDIR)$(man3dir)/pcre16_get_substring.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_get_substring_list.3 $(DESTDIR)$(man3dir)/pcre16_get_substring_list.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_jit_stack_alloc.3 $(DESTDIR)$(man3dir)/pcre16_jit_stack_alloc.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_jit_stack_free.3 $(DESTDIR)$(man3dir)/pcre16_jit_stack_free.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_maketables.3 $(DESTDIR)$(man3dir)/pcre16_maketables.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_pattern_to_host_byte_order.3 $(DESTDIR)$(man3dir)/pcre16_pattern_to_host_byte_order.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_refcount.3 $(DESTDIR)$(man3dir)/pcre16_refcount.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_study.3 $(DESTDIR)$(man3dir)/pcre16_study.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_utf16_to_host_byte_order.3 $(DESTDIR)$(man3dir)/pcre16_utf16_to_host_byte_order.3 -- ln -s $(DESTDIR)$(man3dir)/pcre_version.3 $(DESTDIR)$(man3dir)/pcre16_version.3 -+ ln -s pcre_assign_jit_stack.3 $(DESTDIR)$(man3dir)/pcre16_assign_jit_stack.3 -+ ln -s pcre_compile.3 $(DESTDIR)$(man3dir)/pcre16_compile.3 -+ ln -s pcre_compile2.3 $(DESTDIR)$(man3dir)/pcre16_compile2.3 -+ ln -s pcre_config.3 $(DESTDIR)$(man3dir)/pcre16_config.3 -+ ln -s pcre_copy_named_substring.3 $(DESTDIR)$(man3dir)/pcre16_copy_named_substring.3 -+ ln -s pcre_copy_substring.3 $(DESTDIR)$(man3dir)/pcre16_copy_substring.3 -+ ln -s pcre_dfa_exec.3 $(DESTDIR)$(man3dir)/pcre16_dfa_exec.3 -+ ln -s pcre_exec.3 $(DESTDIR)$(man3dir)/pcre16_exec.3 -+ ln -s pcre_free_study.3 $(DESTDIR)$(man3dir)/pcre16_free_study.3 -+ ln -s pcre_free_substring.3 $(DESTDIR)$(man3dir)/pcre16_free_substring.3 -+ ln -s pcre_free_substring_list.3 $(DESTDIR)$(man3dir)/pcre16_free_substring_list.3 -+ ln -s pcre_fullinfo.3 $(DESTDIR)$(man3dir)/pcre16_fullinfo.3 -+ ln -s pcre_get_named_substring.3 $(DESTDIR)$(man3dir)/pcre16_get_named_substring.3 -+ ln -s pcre_get_stringnumber.3 $(DESTDIR)$(man3dir)/pcre16_get_stringnumber.3 -+ ln -s pcre_get_stringtable_entries.3 $(DESTDIR)$(man3dir)/pcre16_get_stringtable_entries.3 -+ ln -s pcre_get_substring.3 $(DESTDIR)$(man3dir)/pcre16_get_substring.3 -+ ln -s pcre_get_substring_list.3 $(DESTDIR)$(man3dir)/pcre16_get_substring_list.3 -+ ln -s pcre_jit_stack_alloc.3 $(DESTDIR)$(man3dir)/pcre16_jit_stack_alloc.3 -+ ln -s pcre_jit_stack_free.3 $(DESTDIR)$(man3dir)/pcre16_jit_stack_free.3 -+ ln -s pcre_maketables.3 $(DESTDIR)$(man3dir)/pcre16_maketables.3 -+ ln -s pcre_pattern_to_host_byte_order.3 $(DESTDIR)$(man3dir)/pcre16_pattern_to_host_byte_order.3 -+ ln -s pcre_refcount.3 $(DESTDIR)$(man3dir)/pcre16_refcount.3 -+ ln -s pcre_study.3 $(DESTDIR)$(man3dir)/pcre16_study.3 -+ ln -s pcre_utf16_to_host_byte_order.3 $(DESTDIR)$(man3dir)/pcre16_utf16_to_host_byte_order.3 -+ ln -s pcre_version.3 $(DESTDIR)$(man3dir)/pcre16_version.3 - - pcrecpp_man = doc/pcrecpp.3 - EXTRA_DIST += $(pcrecpp_man) 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 - 8.30-1 +- 8.30 bump + * Fri Jan 27 2012 Petr Pisar - 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