pool/salt
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 473298 from home:bmaryniuk:branches:systemsmanagement:saltstack

Browse Source 
Update to 2016.11.3 version, pkg deps fix

OBS-URL: https://build.opensuse.org/request/show/473298
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=87
This commit is contained in:
Klaus Kämpf
2017-03-03 14:58:24 +00:00
committed by Git OBS Bridge
parent 02cd6e0087
commit 1033bb543d
19 changed files with 457 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
salt.spec
View File

@@ -37,7 +37,7 @@
%bcond_with builddocs
Name: salt
Version: 2016.11.2
Version: 2016.11.3
Release: 0
Summary: A parallel remote execution system
License: Apache-2.0
@@ -51,22 +51,21 @@ Source3: html.tar.bz2
Source4: update-documentation.sh
Source5: travis.yml
# We do not upstream this patch because this is something that we have to fix on our side
# PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
# We do not upstream this patch because this is something that we have to fix on our side
Patch1: tserong-suse.com-we-don-t-have-python-systemd-so-not.patch
# We do not upstream this patch because this is suse custom configuration
# PATCH-FIX-OPENSUSE use-salt-user-for-master.patch -- Run salt master as dedicated salt user
# We do not upstream this patch because this is suse custom configuration
Patch2: run-salt-master-as-dedicated-salt-user.patch
# (see: https://trello.com/c/wh96lCD4/1528-get-rid-of-0003-check-if-byte-strings-are-properly-encoded-in-utf-8-patch-in-the-salt-package)
# We do not upstream this patch because it has been fixed upstream
# PATCH-FIX-OPENSUSE https://github.com/saltstack/salt/pull/30424
# We do not upstream this patch because it has been fixed upstream
# (see: https://trello.com/c/wh96lCD4/1528-get-rid-of-0003-check-if-byte-strings-are-properly-encoded-in-utf-8-patch-in-the-salt-package)
Patch3: check-if-byte-strings-are-properly-encoded-in-utf-8.patch
# We do not upstream this patch because the issue is on our side
# PATCH-FIX-OPENSUSE prevent rebuilds in OBS
# We do not upstream this patch because the issue is on our side
Patch4: do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch
# We do not upstream this because this is for SUSE only (15.08.2016)
# PATCH-FIX-OPENSUSE Generate events from the Salt minion,
# if Zypper has been used outside the Salt infrastructure
# We do not upstream this because this is for SUSE only (15.08.2016) if Zypper has been used outside the Salt infrastructure
Patch5: add-zypp-notify-plugin.patch
# PATCH-FIX_OPENSUSE
Patch6: run-salt-api-as-user-salt-bsc-990029.patch
@@ -82,30 +81,16 @@ Patch10: avoid-failures-on-sles-12-sp2-because-of-new-systemd.patch
Patch11: add-yum-plugin.patch
# PATCH-FIX_OPENSUSE
Patch12: add-ssh-option-to-salt-ssh.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38639/commits
Patch13: fix-a-typo-for-master-comments.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38806
Patch14: add-a-salt-minion-service-control-file.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38824
Patch15: add-buildargs-option-to-dockerng.build.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38885
Patch16: increasing-timeouts-for-running-integrations-tests.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38957
Patch17: fix-timezone-handling-for-rpm-installtime-bsc-101707.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38940/commits
Patch18: fix-leading-dots-on-sanitized-hostname.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38991
Patch19: prevent-crash-on-unknown-to-the-repo-package.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39111
Patch20: docker-buildargs-require-minimal-dockerpy-1.6.0-and-.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39179
Patch21: fix-error-parsing.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39162
Patch22: snapper-module-improvements.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39278
Patch23: support-dryrun-for-dockerng.sls_build.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39400
Patch24: prevents-oserror-exception-in-case-path-doesn-t-exis.patch
Patch13: add-a-salt-minion-service-control-file.patch
# PATCH-FIX-OPENSUSE
Patch14: add-options-for-dockerng.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39591
Patch15: fix-case-in-os_family-for-suse.patch
# PATCH-FIX_OPENSUSE
Patch16: translate-variable-arguments-if-they-contain-hidden-.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39762
Patch17: fix-regression-in-file.get_managed-add-unit-tests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate
@@ -117,13 +102,13 @@ BuildRequires: python-jinja2
%else
BuildRequires: python-Jinja2
%endif
BuildRequires: python-MarkupSafe
BuildRequires: python-PyYAML
BuildRequires: python-futures >= 2.0
BuildRequires: python-markupsafe
BuildRequires: python-msgpack-python > 0.3
BuildRequires: python-psutil
BuildRequires: python-requests >= 1.0.0
BuildRequires: python-tornado >= 4.2.1
BuildRequires: python-yaml
# requirements/opt.txt (not all)
# BuildRequires: python-MySQL-python
# BuildRequires: python-timelib
@@ -182,13 +167,13 @@ Requires: yum
%else
Requires: python-Jinja2
%endif
Requires: python-MarkupSafe
Requires: python-PyYAML
Requires: python-futures >= 2.0
Requires: python-markupsafe
Requires: python-msgpack-python > 0.3
Requires: python-psutil
Requires: python-requests >= 1.0.0
Requires: python-tornado >= 4.2.1
Requires: python-yaml
%if 0%{?suse_version}
# required for zypper.py
Requires: rpm-python
@@ -497,13 +482,6 @@ cp %{S:5} ./.travis.yml
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%build
%{__python} setup.py --salt-transport=both build