From 807456070f676069ec5e2f871faf24bb51a41d02 Mon Sep 17 00:00:00 2001
From: Eugine Blikh <bigbes@gmail.com>
Date: Wed, 25 Jun 2014 09:38:05 +0400
Subject: [PATCH] fix for rhel 7 for scl metapackage
---
extra/rpm/tarantool-scl.rpm.spec | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/extra/rpm/tarantool-scl.rpm.spec b/extra/rpm/tarantool-scl.rpm.spec
index dbec0df4b9..f71e59e237 100644
--- a/extra/rpm/tarantool-scl.rpm.spec
+++ b/extra/rpm/tarantool-scl.rpm.spec
@@ -3,10 +3,13 @@
%define _source_filedigest_algorithm 0
%define _binary_filedigest_algorithm 0
-%{?scl:%global _scl_prefix /opt/tarantool}
-%{?scl:%scl_package}
+%global _scl_prefix /opt/tarantool
+%scl_package
-%{?scl:%global scl_name tarantool-%scl}
+%global scl_name tarantool-%scl
+
+%{?scl:BuildRequires: scl-utils-build}
+%{?scl:BuildRequires: iso-codes}
# Strange bug. Fix according to http://www.jethrocarr.com/2012/05/23/bad-packaging-habits/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,8 +28,7 @@ Requires: %{scl_prefix}tarantool-mysql-module
Requires: %{scl_prefix}tarantool-sophia-module
Requires: %{scl_prefix}tarantool-client
Requires: %{scl_prefix}tarantool-dev
-%{?scl:BuildRequires: scl-utils-build}
-%{?scl:BuildRequires: iso-codes}
+Requires: scl-utils
%description
This is the main package for %scl_name Software Collection.
@@ -66,6 +68,9 @@ EOF
%{_root_sysconfdir}/rpm/macros.%{scl}-config
%files runtime
+%if "0%{rhel}" == "07"
+%{_scl_root}/%{_lib}
+%endif
%scl_files
%changelog
--
GitLab