From 52280fb375f402b25ac58fadda890663971f5105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 22 Jun 2015 12:40:47 +0200 Subject: [PATCH] Preserve soname --- ...0-RC1-Correct-library-version-number.patch | 34 +++++++++++++++++++ pcre2.spec | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 pcre2-10.20-RC1-Correct-library-version-number.patch diff --git a/pcre2-10.20-RC1-Correct-library-version-number.patch b/pcre2-10.20-RC1-Correct-library-version-number.patch new file mode 100644 index 0000000..27962b4 --- /dev/null +++ b/pcre2-10.20-RC1-Correct-library-version-number.patch @@ -0,0 +1,34 @@ +From 1076ae5570df40b87c7fef5e2fe194c779d142a2 Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Mon, 22 Jun 2015 09:47:08 +0000 +Subject: [PATCH] Correct library version number. +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@294 6239d852-aaf2-0410-a92c-79f79f948069 +Signed-off-by: Petr Písař +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2b0d1df..1b374ec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,9 +17,9 @@ m4_define(pcre2_date, [2015-06-16]) + # 50 lines of this file. Please update that if the variables above are moved. + + # Libtool shared library interface versions (current:revision:age) +-m4_define(libpcre2_8_version, [2:0:0]) +-m4_define(libpcre2_16_version, [2:0:0]) +-m4_define(libpcre2_32_version, [2:0:0]) ++m4_define(libpcre2_8_version, [2:0:2]) ++m4_define(libpcre2_16_version, [2:0:2]) ++m4_define(libpcre2_32_version, [2:0:2]) + m4_define(libpcre2_posix_version, [0:0:0]) + + AC_PREREQ(2.57) +-- +2.1.0 + diff --git a/pcre2.spec b/pcre2.spec index 31c3cbc..6aa155d 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -16,6 +16,8 @@ URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2 # Do no set RPATH if libdir is not /usr/lib Patch0: pcre2-10.10-Fix-multilib.patch +# Preserve soname, in upstream after 10.20-RC1 +Patch1: pcre2-10.20-RC1-Correct-library-version-number.patch # New libtool to get rid of RPATH and to use distribution autotools BuildRequires: autoconf @@ -76,6 +78,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test. %prep %setup -q -n %{name}-%{myversion} %patch0 -p1 +%patch1 -p1 # Because of multilib patch libtoolize --copy --force autoreconf -vif @@ -157,6 +160,7 @@ make %{?_smp_mflags} check VERBOSE=yes * Fri Jun 19 2015 Petr Pisar - 10.20-0.1.RC1 - 10.20-RC1 bump - Replace dependency on glibc-headers with gcc (bug #1230479) +- Preserve soname * Thu Jun 18 2015 Fedora Release Engineering - 10.10-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild