rpms/pcre2
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Preserve soname

Browse Source
This commit is contained in:
Petr Písař 2015-06-22 12:40:47 +02:00
parent 513d02a850
commit 52280fb375
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pcre2-10.20-RC1-Correct-library-version-number.patch Normal file
View File

@ -0,0 +1,34 @@
From 1076ae5570df40b87c7fef5e2fe194c779d142a2 Mon Sep 17 00:00:00 2001
From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
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ř <ppisar@redhat.com>
---
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

4
pcre2.spec
View File

@ -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 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 # Do no set RPATH if libdir is not /usr/lib
Patch0: pcre2-10.10-Fix-multilib.patch 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 # New libtool to get rid of RPATH and to use distribution autotools
BuildRequires: autoconf BuildRequires: autoconf
@ -76,6 +78,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
%prep %prep
%setup -q -n %{name}-%{myversion} %setup -q -n %{name}-%{myversion}
%patch0 -p1 %patch0 -p1
%patch1 -p1
# Because of multilib patch # Because of multilib patch
libtoolize --copy --force libtoolize --copy --force
autoreconf -vif autoreconf -vif
@ -157,6 +160,7 @@ make %{?_smp_mflags} check VERBOSE=yes
* Fri Jun 19 2015 Petr Pisar <ppisar@redhat.com> - 10.20-0.1.RC1 * Fri Jun 19 2015 Petr Pisar <ppisar@redhat.com> - 10.20-0.1.RC1
- 10.20-RC1 bump - 10.20-RC1 bump
- Replace dependency on glibc-headers with gcc (bug #1230479) - Replace dependency on glibc-headers with gcc (bug #1230479)
- Preserve soname
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.10-3.1 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.10-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild