From b49b374e5ae3f8352d2e65a27c0f88202422e1bc Mon Sep 17 00:00:00 2001
From: bigbes <bigbes@gmail.com>
Date: Fri, 27 Jun 2014 00:43:35 -0400
Subject: [PATCH] SCL prefix 15->mailru-15, fix paths for scl
---
cmake/rpm.cmake | 6 +++---
extra/rpm/tarantool-scl.rpm.spec | 4 +---
extra/rpm/tarantool.rpm.spec.in | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/cmake/rpm.cmake b/cmake/rpm.cmake
index e4a0c9d6c4..5a9b7436bf 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 f71e59e237..8157d069ab 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 974582a673..3b0c268a38 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
--
GitLab