rpms/mariadb10.11
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update PCRE version and fix its failsafe

Browse Source
This commit is contained in:
Michal Schorm 2017-10-16 14:42:14 +02:00
parent d34bedc1a2
commit 7b7a7f80e2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mariadb.spec
View File

@ -81,7 +81,7 @@
# MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use # MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use
# the bundled library, since the package cannot be build with older version # the bundled library, since the package cannot be build with older version
%global pcre_version 8.40 %global pcre_version 8.41
%if 0%{?fedora} >= 21 %if 0%{?fedora} >= 21
%bcond_without pcre %bcond_without pcre
%else %else
@ -677,7 +677,7 @@ cat selinux/%{name}-server-galera.te
%endif %endif
# Check if PCRE version is actual # Check if PCRE version is actual
%{!?with_pcre: %if %{with pcre}
pcre_maj=`grep '^m4_define(pcre_major' pcre/configure.ac | sed -r 's/^m4_define\(pcre_major, \[([0-9]+)\]\)/\1/'` pcre_maj=`grep '^m4_define(pcre_major' pcre/configure.ac | sed -r 's/^m4_define\(pcre_major, \[([0-9]+)\]\)/\1/'`
pcre_min=`grep '^m4_define(pcre_minor' pcre/configure.ac | sed -r 's/^m4_define\(pcre_minor, \[([0-9]+)\]\)/\1/'` pcre_min=`grep '^m4_define(pcre_minor' pcre/configure.ac | sed -r 's/^m4_define\(pcre_minor, \[([0-9]+)\]\)/\1/'`
@ -686,7 +686,7 @@ then
echo "\n Error: PCRE version is outdated. \n\tIncluded version:%{pcre_version} \n\tUpstream version: $pcre_maj.$pcre_min\n" echo "\n Error: PCRE version is outdated. \n\tIncluded version:%{pcre_version} \n\tUpstream version: $pcre_maj.$pcre_min\n"
exit 1 exit 1
fi fi
} %endif
%if %{without rocksdb} %if %{without rocksdb}
rm -r storage/rocksdb/ rm -r storage/rocksdb/