rpm/salt
SHA256
1
0
Fork 0
forked from pool/salt
Code Pull Requests Activity

osc copypac from project:systemsmanagement:saltstack:testing package:salt revision:268

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=142
This commit is contained in:
Pablo Suárez Hernández 2019-05-23 09:12:16 +00:00 committed by Git OBS Bridge
parent 021d4c9564
commit f3119a1886
4 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_lastrevision
View File

@ -1 +1 @@
ea5a745c3a962219fd886eefc19f33997b655283
9811afea3edef900b60b0fc513ffcb090a8ea8c6

26
add-standalone-configuration-file-for-enabling-packa.patch Normal file
View File

@ -0,0 +1,26 @@
From 74160010c0fdddb04980ad664e155550382ef82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernandez@suse.com>
Date: Wed, 22 May 2019 13:00:46 +0100
Subject: [PATCH] Add standalone configuration file for enabling package
formulas
---
conf/suse/standalone-formulas-configuration.conf | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 conf/suse/standalone-formulas-configuration.conf
diff --git a/conf/suse/standalone-formulas-configuration.conf b/conf/suse/standalone-formulas-configuration.conf
new file mode 100644
index 0000000000..94d05fb2ee
--- /dev/null
+++ b/conf/suse/standalone-formulas-configuration.conf
@@ -0,0 +1,4 @@
+file_roots:
+ base:
+ - /usr/share/salt-formulas/states
+ - /srv/salt
--
2.17.1

8
salt.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu May 23 08:27:52 UTC 2019 - psuarezhernandez@suse.com
- Add new "salt-standalone-formulas-configuration" package
- Added:
* add-standalone-configuration-file-for-enabling-packa.patch
-------------------------------------------------------------------
Mon May 20 12:12:46 UTC 2019 - psuarezhernandez@suse.com

28
salt.spec
View File

@ -176,6 +176,8 @@ Patch53: do-not-crash-when-there-are-ipv6-established-connect.patch
Patch54: fix-async-batch-multiple-done-events.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/52743
Patch55: switch-firewalld-state-to-use-change_interface.patch
# PATCH-FIX_OPENSUSE
Patch56: add-standalone-configuration-file-for-enabling-packa.patch
# BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -629,6 +631,18 @@ Zsh command line completion support for %{name}.
%endif
%package standalone-formulas-configuration
Summary: Standalone Salt configuration to make the packaged formulas available for the Salt master
Group: System/Management
Requires: %{name} = %{version}-%{release}
Requires: %{name}-master = %{version}-%{release}
Provides: salt-formulas-configuration
Conflicts: otherproviders(salt-formulas-configuration)
%description standalone-formulas-configuration
This package adds the standalone configuration for the Salt master in order to make the packaged Salt formulas available on the Salt master
%prep
# %setup -q -n salt-%{version}
%setup -q -n salt-2019.2.0-suse
@ -689,6 +703,7 @@ cp %{S:5} ./.travis.yml
%patch53 -p1
%patch54 -p1
%patch55 -p1
%patch56 -p1
%build
%if 0%{?build_py2}
@ -870,6 +885,12 @@ mkdir -p %{buildroot}%{fish_completions_dir}
install -Dpm 0644 pkg/fish-completions/* %{buildroot}%{fish_completions_dir}
%endif
# Standalone Salt formulas configuration
install -Dd -m 0750 %{buildroot}%{_prefix}/share/salt-formulas
install -Dd -m 0750 %{buildroot}%{_prefix}/share/salt-formulas/states
install -Dd -m 0750 %{buildroot}%{_prefix}/share/salt-formulas/metadata
install -Dpm 0640 conf/suse/standalone-formulas-configuration.conf %{buildroot}%{_sysconfdir}/salt/master.d
%if 0%{?suse_version} > 1020
%fdupes %{buildroot}%{_docdir}
%if 0%{?build_py2}
@ -1400,6 +1421,13 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
%dir %{fish_dir}
%endif
%files standalone-formulas-configuration
%defattr(-,root,root)
%config(noreplace) %attr(0640, root, root) %{_sysconfdir}/salt/master.d/standalone-formulas-configuration.conf
%dir %attr(0750, root, root) %{_prefix}/share/salt-formulas/
%dir %attr(0750, root, root) %{_prefix}/share/salt-formulas/states/
%dir %attr(0750, root, root) %{_prefix}/share/salt-formulas/metadata/
%changelog