From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [94.100.177.111])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 5B1C442EF5D
 for <tarantool-patches@dev.tarantool.org>;
 Thu, 18 Jun 2020 08:37:09 +0300 (MSK)
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Thu, 18 Jun 2020 08:36:50 +0300
Message-Id: <9583c86c694943a5e1d860e8671d39952a4ae66f.1592458150.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1592458150.git.avtikhon@tarantool.org>
References: <cover.1592458150.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1592458150.git.avtikhon@tarantool.org>
References: <cover.1592458150.git.avtikhon@tarantool.org>
Subject: [Tarantool-patches] [PATCH v1 2/4] build: remove libyaml from
	rpm/deb dependencies
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Kirill Yukhin <kyukhin@tarantool.org>, Sergey Bronnikov <sergeyb@tarantool.org>, Alexander Turenko <alexander.turenko@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

From: Serge Petrenko <sergepetrenko@tarantool.org>

After we started using bundled version of libyaml by default (see commit
47b91e90f2a4e23e70a1a6735af3de203ffd59f4), we can remove it from
building dependencies for RPM and DEB packages.

Closes #4442

Reviewed-by: Alexander Turenko <alexander.turenko@tarantool.org>
(cherry picked from commit 1d4e584a7b5a5570486d7dfa6df82e664f8e0f95)
---
 debian/control     | 3 +--
 rpm/tarantool.spec | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 91d0b0e44..ea2e151fd 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: cdbs (>= 0.4.100), debhelper (>= 9), dpkg-dev (>= 1.16.1~),
  cmake,
  libreadline-dev,
  libncurses5-dev,
- libyaml-dev,
  libssl-dev,
  libunwind-dev | libunwind8-dev | libunwind7-dev,
  libicu-dev,
@@ -54,7 +53,7 @@ Package: tarantool
 Architecture: i386 amd64 armhf arm64
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, binutils, libgomp1,
- libyaml-0-2, openssl, tarantool-common (>= 1.7.5.46),
+  openssl, tarantool-common (>= 1.7.5.46),
 # libcurl dependencies (except ones we have already)
  zlib1g
 Replaces: tarantool-lts
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 4b6ea6f9f..88b1d6b5c 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -15,7 +15,6 @@ BuildRequires: gcc-c++ >= 4.5
 BuildRequires: coreutils
 BuildRequires: sed
 BuildRequires: readline-devel
-BuildRequires: libyaml-devel
 BuildRequires: openssl-devel
 BuildRequires: libicu-devel
 #BuildRequires: msgpuck-devel
-- 
2.17.1