Skip to content
Snippets Groups Projects
Commit ef7a350a authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Update dependencies for the new package manager

LuaRocks requires openssl and curl in order to download
manifest from rocks.tarantool.org.

Fixes #2612
parent 4cf76012
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,11 @@ Conflicts: tarantool-common (<< 1.5.3),
tarantool-postgresql-module,
libtarantool-dev (<< 1.6~)
Replaces: tarantool-common (<< 1.5.3), tarantool-lts-common
Depends: ${misc:Depends}, adduser, lsb-base
Depends: ${misc:Depends}, adduser, lsb-base,
# Deps for built-in package manager
# https://github.com/tarantool/tarantool/issues/2612
openssl, curl
Recommends: tarantool-dev, git, build-essential, cmake
Description: Tarantool in-memory database - common files
Tarantool is an in-memory database and Lua application server.
This package provides scripts to work with tarantool configuration
......
......@@ -17,6 +17,8 @@ site_config.LUAROCKS_HOME_TREE_SUBDIR=[[/.rocks]]
site_config.LUA_DIR_SET=true
site_config.LUAROCKS_UNAME_S=[[@CMAKE_SYSTEM_NAME@]]
site_config.LUAROCKS_UNAME_M=[[@CMAKE_SYSTEM_PROCESSOR@]]
site_config.LUAROCKS_DOWNLOADER=[[curl]]
site_config.LUAROCKS_MD5CHECKER=[[openssl]]
site_config.LUAROCKS_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[@MULTILIB@]] }, include="include" }
site_config.LUAROCKS_RUNTIME_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[@MULTILIB@]] }, include="include" }
site_config.LUAROCKS_LOCAL_BY_DEFAULT = true
......
......@@ -6,7 +6,12 @@
%endif
BuildRequires: cmake >= 2.8
BuildRequires: make
%if (0%{?fedora} >= 22 || 0%{?rhel} >= 7)
# RHEL 6 requires devtoolset
BuildRequires: gcc >= 4.5
BuildRequires: gcc-c++ >= 4.5
%endif
BuildRequires: coreutils
BuildRequires: sed
BuildRequires: readline-devel
......@@ -77,6 +82,20 @@ Obsoletes: tarantool-common < 1.6.8.434-1
# https://github.com/tarantool/tarantool/issues/1794
Requires: /etc/protocols
Requires: /etc/services
# Deps for built-in package manager
# https://github.com/tarantool/tarantool/issues/2612
Requires: openssl
Requires: curl
%if (0%{?fedora} >= 22 || 0%{?rhel} >= 8)
# RHEL <= 7 doesn't support Recommends:
Recommends: tarantool-devel
Recommends: git-core
Recommends: cmake >= 2.8
Recommends: make
Recommends: gcc >= 4.5
Recommends: gcc-c++ >= 4.5
%endif
URL: http://tarantool.org
Source0: http://download.tarantool.org/tarantool/1.7/src/tarantool-%{version}.tar.gz
%description
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment