Accepting request 546088 from home:mdinca:branches:systemsmanagement:saltstack

- Run salt master as dedicated salt user
- Run salt-api as user salt (bsc#1064520)
- Added:
 * run-salt-master-as-dedicated-salt-user.patch
 * run-salt-api-as-user-salt-bsc-1064520.patch

OBS-URL: https://build.opensuse.org/request/show/546088
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=101
This commit is contained in:
Pablo Suárez Hernández
2017-11-27 17:18:19 +00:00
committed by Git OBS Bridge
parent a8f280f24d
commit 77b505ab99
5 changed files with 94 additions and 30 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package salt
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -57,10 +57,12 @@ Patch3: multiprocessing-minion-option-documentation-fixes.patch
Patch4: introduce-process_count_max-minion-configuration-par.patch
Patch5: bugfix-always-return-a-string-list-on-unknown-job-ta.patch
Patch6: enable-with-salt-version-parameter-for-setup.py-scri.patch
Patch7: run-salt-master-as-dedicated-salt-user.patch
Patch8: run-salt-api-as-user-salt-bsc-1064520.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-rpm-macros
BuildRequires: logrotate
BuildRequires: python-rpm-macros
BuildRequires: python3
BuildRequires: python3-devel
# requirements/base.txt
@@ -70,11 +72,11 @@ BuildRequires: python3-jinja2
BuildRequires: python3-Jinja2
%endif
BuildRequires: python3-MarkupSafe
BuildRequires: python3-PyYAML
BuildRequires: python3-msgpack-python > 0.3
BuildRequires: python3-psutil
BuildRequires: python3-requests >= 1.0.0
BuildRequires: python3-tornado >= 4.2.1
BuildRequires: python3-PyYAML
# requirements/zeromq.txt
BuildRequires: python3-pycrypto >= 2.6.1
@@ -110,8 +112,8 @@ Requires(pre): dbus-1
Requires(pre): dbus
%endif
Requires: procps
Requires: logrotate
Requires: procps
Requires: python3
#
%if ! 0%{?suse_version} > 1110
@@ -119,20 +121,20 @@ Requires: python3-certifi
%endif
# requirements/base.txt
%if 0%{?rhel}
Requires: python3-jinja2
Requires: yum
Requires: python3-jinja2
Requires: yum
%if 0%{?rhel} == 6
Requires: yum-plugin-security
Requires: yum-plugin-security
%endif
%else
Requires: python3-Jinja2
Requires: python3-Jinja2
%endif
Requires: python3-MarkupSafe
Requires: python3-PyYAML
Requires: python3-msgpack-python > 0.3
Requires: python3-psutil
Requires: python3-requests >= 1.0.0
Requires: python3-tornado >= 4.2.1
Requires: python3-PyYAML
%if 0%{?suse_version}
# required for zypper.py
Requires: python3-rpm
@@ -402,6 +404,8 @@ cp %{S:6} ./zyppnotify
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
%{__python3} setup.py --salt-transport=both build