From 31ff7b49871a79a47ab1e5bffd8f42a46435df0b Mon Sep 17 00:00:00 2001 From: Alexis Mousset Date: Thu, 18 Apr 2019 10:28:00 +0200 Subject: [PATCH] Fixes #14701: Remove asciidoc dependencies from relay package --- rudder-server-relay/SOURCES/.dependencies | 6 +++--- rudder-server-relay/SPECS/rudder-server-relay.spec | 2 +- rudder-server-relay/debian/control | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rudder-server-relay/SOURCES/.dependencies b/rudder-server-relay/SOURCES/.dependencies index 0315f7ab3..cdd62280c 100644 --- a/rudder-server-relay/SOURCES/.dependencies +++ b/rudder-server-relay/SOURCES/.dependencies @@ -1,3 +1,3 @@ -SLES12:python-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel asciidoc -SLES15:python-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel asciidoc -RHEL7:python-devel selinux-policy-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel asciidoc +SLES12:python-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel +SLES15:python-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel +RHEL7:python-devel selinux-policy-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel diff --git a/rudder-server-relay/SPECS/rudder-server-relay.spec b/rudder-server-relay/SPECS/rudder-server-relay.spec index e03c41b99..b0c185a09 100644 --- a/rudder-server-relay/SPECS/rudder-server-relay.spec +++ b/rudder-server-relay/SPECS/rudder-server-relay.spec @@ -67,7 +67,7 @@ AutoReq: 0 AutoProv: 0 ## General -BuildRequires: python, python-devel, pkgconfig, postgresql-devel, openssl-devel, zlib-devel, xz-devel, asciidoc +BuildRequires: python, python-devel, pkgconfig, postgresql-devel, openssl-devel, zlib-devel, xz-devel Requires: rudder-agent >= %{real_epoch}:%{real_version}, rsyslog, openssl, %{apache}, %{apache_tools}, python, binutils, xz, zlib, postgresql-libs ## RHEL %if 0%{?rhel} diff --git a/rudder-server-relay/debian/control b/rudder-server-relay/debian/control index ad8564e1b..fec1a9545 100644 --- a/rudder-server-relay/debian/control +++ b/rudder-server-relay/debian/control @@ -2,7 +2,7 @@ Source: rudder-server-relay Section: web Priority: extra Maintainer: Rudder Team -Build-Depends: debhelper (>= 9), python, libpython-dev | libpython2.7-dev | python2.7-dev, ca-certificates, curl, pkg-config, libpq-dev, libssl-dev, zlib1g-dev, lzma-dev, asciidoc, xsltproc +Build-Depends: debhelper (>= 9), python, libpython-dev | libpython2.7-dev | python2.7-dev, ca-certificates, curl, pkg-config, libpq-dev, libssl-dev, zlib1g-dev, lzma-dev Standards-Version: 3.8.0 Homepage: https://www.rudder.io