diff --git a/.gitignore b/.gitignore index ee875bd..18ca0c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pcre2-10.10.tar.bz2 /pcre2-10.20-RC1.tar.bz2 +/pcre2-10.20.tar.bz2 diff --git a/pcre2-10.20-RC1-Correct-library-version-number.patch b/pcre2-10.20-RC1-Correct-library-version-number.patch deleted file mode 100644 index 27962b4..0000000 --- a/pcre2-10.20-RC1-Correct-library-version-number.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 6aa155d..37b8956 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -1,5 +1,5 @@ # This is stable release: -%global rcversion RC1 +#%%global rcversion RC1 Name: pcre2 Version: 10.20 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 # 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 @@ -78,7 +76,6 @@ 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 +154,9 @@ make %{?_smp_mflags} check VERBOSE=yes %{_mandir}/man1/pcre2test.* %changelog +* Fri Jul 03 2015 Petr Pisar - 10.20-1 +- 10.20 bump + * Fri Jun 19 2015 Petr Pisar - 10.20-0.1.RC1 - 10.20-RC1 bump - Replace dependency on glibc-headers with gcc (bug #1230479) diff --git a/sources b/sources index 3d3c245..2f602c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7999e2d0ea0f57ec4506f033d5f62ae5 pcre2-10.20-RC1.tar.bz2 +dcd027c57ecfdc8a6c3af9d0acf5e3f7 pcre2-10.20.tar.bz2