From bc866320ff01606cc8be4ec577aad2985293e183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 4 Jul 2016 10:02:09 +0200 Subject: [PATCH] Bump pcre2posix SONAME because of ABI change in 10.22-RC1 --- ...ONAME-for-pcre2posix-wrapper-library.patch | 30 +++++++++++++++++++ pcre2.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pcre2-10.22-RC1-Fix-incorrect-SONAME-for-pcre2posix-wrapper-library.patch diff --git a/pcre2-10.22-RC1-Fix-incorrect-SONAME-for-pcre2posix-wrapper-library.patch b/pcre2-10.22-RC1-Fix-incorrect-SONAME-for-pcre2posix-wrapper-library.patch new file mode 100644 index 0000000..2e5177c --- /dev/null +++ b/pcre2-10.22-RC1-Fix-incorrect-SONAME-for-pcre2posix-wrapper-library.patch @@ -0,0 +1,30 @@ +From 96715b703ae66d10c312c1ef9e3d297b17a7145e Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Sat, 2 Jul 2016 16:03:06 +0000 +Subject: [PATCH] Fix incorrect SONAME for pcre2posix wrapper library. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@541 6239d852-aaf2-0410-a92c-79f79f948069 +Signed-off-by: Petr Písař +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7230ebb..d119f82 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,7 +20,7 @@ m4_define(pcre2_date, [2016-06-29]) + m4_define(libpcre2_8_version, [4:0:4]) + m4_define(libpcre2_16_version, [4:0:4]) + m4_define(libpcre2_32_version, [4:0:4]) +-m4_define(libpcre2_posix_version, [0:2:0]) ++m4_define(libpcre2_posix_version, [1:0:0]) + + AC_PREREQ(2.57) + AC_INIT(PCRE2, pcre2_major.pcre2_minor[]pcre2_prerelease, , pcre2) +-- +2.5.5 + diff --git a/pcre2.spec b/pcre2.spec index 7437071..b9053e3 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -27,6 +27,9 @@ Patch1: pcre2-10.22-RC1-Fix-register-overwite-in-JIT-when-SSE2-acceleration- # Test for Fix-register-overwite-in-JIT-when-SSE2-acceleration-.patch, in # upstream after 10.22-RC1 Patch2: pcre2-10.22-RC1-Additional-test-for-recent-JIT-bugfix.patch +# Bump pcre2posix SONAME because of ABI change in 10.22-RC1, in upstream after +# 10.22-RC1 +Patch3: pcre2-10.22-RC1-Fix-incorrect-SONAME-for-pcre2posix-wrapper-library.patch # New libtool to get rid of RPATH and to use distribution autotools BuildRequires: autoconf @@ -107,6 +110,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Because of multilib patch libtoolize --copy --force autoreconf -vif @@ -205,7 +209,7 @@ make %{?_smp_mflags} check VERBOSE=yes %changelog * Thu Jun 30 2016 Petr Pisar - 10.22-0.1.RC1 - 10.22-RC1 bump -- libpcre2-posix library changed ABI (FIXME: Bump SONAME) +- libpcre2-posix library changed ABI - Fix register overwite in JIT when SSE2 acceleration is enabled * Mon Jun 20 2016 Petr Pisar - 10.21-6