diff --git a/cmake/rpm.cmake b/cmake/rpm.cmake index e4a0c9d6c4703e6c96a924c7a6cad75beb3c1944..5a9b7436bfb97027eb60ad5a3700936a9609c992 100644 --- a/cmake/rpm.cmake +++ b/cmake/rpm.cmake @@ -14,9 +14,9 @@ if (RPMBUILD) OUTPUT_VARIABLE RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) - set (SCL_VERSION "1.0" CACHE STRING "" FORCE) - set (SCL_RELEASE "1" CACHE STRING "" FORCE) - set (SCL_TARANTOOL "15" CACHE STRING "" FORCE) + set (SCL_VERSION "1.0" CACHE STRING "" FORCE) + set (SCL_RELEASE "1" CACHE STRING "" FORCE) + set (SCL_TARANTOOL "mailru-15" CACHE STRING "" FORCE) set (RPM_PACKAGE_VERSION ${VERSION} CACHE STRING "" FORCE) set (RPM_PACKAGE_RELEASE ${RELEASE} CACHE STRING "" FORCE) diff --git a/extra/rpm/tarantool-scl.rpm.spec b/extra/rpm/tarantool-scl.rpm.spec index f71e59e237bb4fefd01ab07b896b4f59284de290..8157d069ab8dc4efe17689ad3c82e07e601ce265 100644 --- a/extra/rpm/tarantool-scl.rpm.spec +++ b/extra/rpm/tarantool-scl.rpm.spec @@ -1,4 +1,4 @@ -%global scl 15 +%global scl mailru-15 %define _source_filedigest_algorithm 0 %define _binary_filedigest_algorithm 0 @@ -6,8 +6,6 @@ %global _scl_prefix /opt/tarantool %scl_package -%global scl_name tarantool-%scl - %{?scl:BuildRequires: scl-utils-build} %{?scl:BuildRequires: iso-codes} diff --git a/extra/rpm/tarantool.rpm.spec.in b/extra/rpm/tarantool.rpm.spec.in index 974582a67389db3cba4709e66c92b355b6893d65..3b0c268a3852859c776c7a6be985732c40c074d6 100644 --- a/extra/rpm/tarantool.rpm.spec.in +++ b/extra/rpm/tarantool.rpm.spec.in @@ -2,8 +2,8 @@ ################# MACROS AND DEFAULTS ############## #################################################### -%{?scl:%{?scl_package:%scl_package tarantool}} -%global scl_runtime tarantool-15-runtime +%{?scl:%global _scl_prefix /opt/tarantool} +%{?scl:%scl_package tarantool} %define _source_filedigest_algorithm 0 %define _binary_filedigest_algorithm 0