rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Re-enable using libedit, which should be now fixed

Browse Source 
Related: #1201988
This commit is contained in:
Honza Horak 2016-02-11 11:40:18 +01:00
parent d43c4315ab
commit f7a17ba600
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mariadb.spec
View File

@ -174,6 +174,7 @@ Patch37: %{pkgnamepatch}-notestdb.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libaio-devel BuildRequires: libaio-devel
BuildRequires: libedit-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: perl BuildRequires: perl
@ -526,10 +527,6 @@ MariaDB is a community developed branch of MySQL.
%patch36 -p1 %patch36 -p1
%patch37 -p1 %patch37 -p1
# removing bundled cmd-line-utils is now disabled
# we cannot use libedit due #1201988
# rm -r cmd-line-utils
sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake
# workaround for upstream bug #56342 # workaround for upstream bug #56342
@ -593,7 +590,6 @@ export LDFLAGS
%cmake . \ %cmake . \
-DBUILD_CONFIG=mysql_release \ -DBUILD_CONFIG=mysql_release \
-DFEATURE_SET="community" \ -DFEATURE_SET="community" \
-DWITH_READLINE=ON \
-DINSTALL_LAYOUT=RPM \ -DINSTALL_LAYOUT=RPM \
-DDAEMON_NAME="%{daemon_name}" \ -DDAEMON_NAME="%{daemon_name}" \
-DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \ -DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \
@ -1208,6 +1204,8 @@ fi
- Add missing requirements for proper wsrep functionality - Add missing requirements for proper wsrep functionality
- Obsolate mariadb-galera & mariadb-galera-server (thanks Tomas Repik) - Obsolate mariadb-galera & mariadb-galera-server (thanks Tomas Repik)
Resolves: #1279753 Resolves: #1279753
- Re-enable using libedit, which should be now fixed
Related: #1201988
* Mon Feb 08 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-4 * Mon Feb 08 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-4
- Use systemd unit file more compatible with upstream - Use systemd unit file more compatible with upstream