10.20 bump
This commit is contained in:
parent
52280fb375
commit
63a8a51639
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/pcre2-10.10.tar.bz2
|
/pcre2-10.10.tar.bz2
|
||||||
/pcre2-10.20-RC1.tar.bz2
|
/pcre2-10.20-RC1.tar.bz2
|
||||||
|
/pcre2-10.20.tar.bz2
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
# This is stable release:
|
# This is stable release:
|
||||||
%global rcversion RC1
|
#%%global rcversion RC1
|
||||||
Name: pcre2
|
Name: pcre2
|
||||||
Version: 10.20
|
Version: 10.20
|
||||||
Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
|
Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
|
||||||
@ -16,8 +16,6 @@ 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
|
||||||
@ -78,7 +76,6 @@ 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 +154,9 @@ make %{?_smp_mflags} check VERBOSE=yes
|
|||||||
%{_mandir}/man1/pcre2test.*
|
%{_mandir}/man1/pcre2test.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 03 2015 Petr Pisar <ppisar@redhat.com> - 10.20-1
|
||||||
|
- 10.20 bump
|
||||||
|
|
||||||
* 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)
|
||||||
|
Loading…
Reference in New Issue
Block a user