rpms
/
salt
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebased recommit

Browse Source
e9
Robby Callicotte 2 years ago
parent 3c059d4304
commit e833154ccb
2 changed files with 154 additions and 291 deletions
Show Stats Download Patch File Download Diff File

23
contextvars.patch
Unescape View File

@ -1,12 +1,19 @@
diff -Nar -u0 a/requirements/base.txt b/requirements/base.txt diff -up salt-3004.2/requirements/base.txt.fix salt-3004.2/requirements/base.txt
--- a/requirements/base.txt 2021-06-09 14:25:03.000000000 +0000 --- salt-3004.2/requirements/base.txt.fix 2022-07-11 09:43:29.460966391 -0500
+++ b/requirements/base.txt 2021-06-23 18:36:51.108332870 +0000 +++ salt-3004.2/requirements/base.txt 2022-07-11 09:43:41.718365776 -0500
@@ -7 +6,0 @@ @@ -4,5 +4,4 @@ PyYAML
MarkupSafe
requests>=1.0.0
distro>=1.0.1
-contextvars -contextvars
diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt psutil>=5.0.0
--- a/requirements/zeromq.txt diff -up salt-3004.2/requirements/zeromq.txt.fix salt-3004.2/requirements/zeromq.txt
+++ b/requirements/zeromq.txt --- salt-3004.2/requirements/zeromq.txt.fix 2022-07-11 09:44:05.438138660 -0500
@@ -4,3 +4 @@ +++ salt-3004.2/requirements/zeromq.txt 2022-07-11 09:45:00.889023236 -0500
@@ -1,6 +1,4 @@
-r base.txt
-r crypto.txt
-pyzmq<=20.0.0 ; python_version < "3.6" -pyzmq<=20.0.0 ; python_version < "3.6"
-pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9" -pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9"
-pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9" -pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9"

422
salt.spec
Unescape View File

@ -1,28 +1,22 @@
## For Python 3 only ## For Python 3 only
%bcond_with tests
%bcond_with docs
%if 0%{?rhel} > 7
%global python3_pkgversion 3
%else
%{!?python3_pkgversion:%global python3_pkgversion 3}
%endif
# Release Candidate # Release Candidate
%define __rc_ver %{nil} %global __rc_ver %{nil}
%global fish_dir %{_datadir}/fish/vendor_functions.d
%global zsh_dir %{_datadir}/zsh/site-functions
%define fish_dir %{_datadir}/fish/vendor_functions.d # py3_shbang_flags is '-s' and causing issues with pip install.
%define zsh_dir %{_datadir}/zsh/site-functions %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//)
Name: salt Name: salt
Version: 3004.2%{?__rc_ver} Version: 3004.2%{?__rc_ver}
Release: 2%{?dist} Release: 3%{?dist}
Summary: A parallel remote execution system Summary: A parallel remote execution system
Group: System Environment/Daemons Group: System Environment/Daemons
License: ASL 2.0 License: ASL 2.0
URL: http://saltstack.org/ URL: https://saltproject.io/
Source0: https://pypi.io/packages/source/s/%{name}/%{name}-%{version}.tar.gz Source0: %{pypi_source}
Source1: %{name}-proxy@.service Source1: %{name}-proxy@.service
Source2: %{name}-master Source2: %{name}-master
Source3: %{name}-syndic Source3: %{name}-syndic
@ -34,20 +28,18 @@ Source8: %{name}-minion.service
Source9: %{name}-api.service Source9: %{name}-api.service
Source10: README.fedora Source10: README.fedora
Source11: %{name}-common.logrotate Source11: %{name}-common.logrotate
Source12: salt.bash Source12: %{name}.bash
Source13: salt.fish Source13: %{name}.fish
Source14: salt_common.fish Source14: %{name}_common.fish
Source15: salt-call.fish Source15: %{name}-call.fish
Source16: salt-cp.fish Source16: %{name}-cp.fish
Source17: salt-key.fish Source17: %{name}-key.fish
Source18: salt-master.fish Source18: %{name}-master.fish
Source19: salt-minion.fish Source19: %{name}-minion.fish
Source20: salt-run.fish Source20: %{name}-run.fish
Source21: salt-syndic.fish Source21: %{name}-syndic.fish
Patch0: contextvars.patch Patch0: contextvars.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
@ -57,48 +49,10 @@ Requires: dmidecode
Requires: pciutils Requires: pciutils
Requires: which Requires: which
Requires: dnf-utils Requires: dnf-utils
Requires: logrotate
%if 0%{?systemd_preun:1} BuildRequires: systemd-rpm-macros
Requires(post): systemd-units BuildRequires: python3-devel
Requires(preun): systemd-units
Requires(postun): systemd-units
%endif
BuildRequires: systemd-units
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-requests
BuildRequires: python%{python3_pkgversion}-mock
BuildRequires: python%{python3_pkgversion}-libcloud
BuildRequires: python%{python3_pkgversion}-six
%if 0%{?rhel} == 7
BuildRequires: python%{python3_pkgversion}-PyYAML
%else
BuildRequires: python%{python3_pkgversion}-pyyaml
%endif
BuildRequires: git
BuildRequires: python%{python3_pkgversion}-distro
Requires: python%{python3_pkgversion}-jinja2
Requires: python%{python3_pkgversion}-msgpack >= 0.5.6
Requires: python%{python3_pkgversion}-pycryptodomex >= 3.7
Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-zmq >= 17.0.0
Requires: python%{python3_pkgversion}-markupsafe
Requires: python%{python3_pkgversion}-rpm
## Tornado removed in Neon
## %%if 0%%{?rhel} == 7
## Requires: python%%{python3_pkgversion}-tornado >= 4.2.1, python%%{python3_pkgversion}-tornado < 5.0
## %%else
## Requires: python%%{python3_pkgversion}-tornado4 >= 4.2.1, python%%{python3_pkgversion}-tornado4 < 5.0
## %%endif
Requires: python%{python3_pkgversion}-pycurl
Requires: python%{python3_pkgversion}-six
Requires: python%{python3_pkgversion}-psutil
Requires: python%{python3_pkgversion}-pyyaml
Requires: python%{python3_pkgversion}-distro
%description %description
@ -114,7 +68,7 @@ servers, handle them quickly and through a simple and manageable interface.
Summary: Management component for salt, a parallel remote execution system Summary: Management component for salt, a parallel remote execution system
Group: System Environment/Daemons Group: System Environment/Daemons
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: python%{python3_pkgversion}-systemd Requires: python3-systemd
%description master %description master
The Salt master is the central server to which all minions connect. The Salt master is the central server to which all minions connect.
@ -148,7 +102,7 @@ Supports Python 3.
Summary: REST API for Salt, a parallel remote execution system Summary: REST API for Salt, a parallel remote execution system
Group: Applications/System Group: Applications/System
Requires: %{name}-master = %{version}-%{release} Requires: %{name}-master = %{version}-%{release}
Requires: python%{python3_pkgversion}-cherrypy >= 3.2.2 Requires: python3-cherrypy >= 3.2.2
%description api %description api
salt-api provides a REST interface to the Salt master. salt-api provides a REST interface to the Salt master.
@ -159,7 +113,7 @@ Supports Python 3.
Summary: Cloud provisioner for Salt, a parallel remote execution system Summary: Cloud provisioner for Salt, a parallel remote execution system
Group: Applications/System Group: Applications/System
Requires: %{name}-master = %{version}-%{release} Requires: %{name}-master = %{version}-%{release}
Requires: python%{python3_pkgversion}-libcloud Requires: python3-libcloud
%description cloud %description cloud
The salt-cloud tool provisions new cloud VMs, installs salt-minion on them, and The salt-cloud tool provisions new cloud VMs, installs salt-minion on them, and
@ -179,58 +133,43 @@ Supports Python 3.
%prep %prep
## %%autosetup %autosetup -p1
%setup -q -c %generate_buildrequires
cd %{name}-%{version} %pyproject_buildrequires
%patch0 -p1
rm -rf %{py3dir}
cp -a . %{py3dir}
%build %build
pushd %{py3dir} %pyproject_wheel
## %%py3_build
## py3_shbang_opts is '-s' and causing issues with pip install
## CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}" %%{__python3} %%{py_setup} %%{?py_setup_args} build --executable="%%{__python3} %%{py3_shbang_opts}" %%{?*}
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3}" %{?*}
sleep 1
popd
%install %install
rm -rf %{buildroot} %pyproject_install
cd $RPM_BUILD_DIR/%{name}-%{version} %pyproject_save_files salt
## rm -rf %%{buildroot}
pushd %{py3dir}
%py3_install
# Add some directories # Add some directories
install -d -m 0755 %{buildroot}%{_var}/log/salt install -d -m 0755 %{buildroot}%{_var}/log/%{name}
touch %{buildroot}%{_var}/log/salt/minion touch %{buildroot}%{_var}/log/%{name}/minion
touch %{buildroot}%{_var}/log/salt/master touch %{buildroot}%{_var}/log/%{name}/master
install -d -m 0755 %{buildroot}%{_var}/cache/salt install -d -m 0755 %{buildroot}%{_var}/cache/%{name}
install -d -m 0755 %{buildroot}%{_sysconfdir}/salt install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/master.d install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/master.d
install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/minion.d install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/minion.d
install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/pki install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/pki
install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/pki/master install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/pki/master
install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/pki/minion install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/pki/minion
install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.conf.d install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.conf.d
install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.deploy.d install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.deploy.d
install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.maps.d install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.maps.d
install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.profiles.d install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.profiles.d
install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.providers.d install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.providers.d
install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/proxy.d install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/proxy.d
# Add the config files # Add the config files
install -p -m 0640 conf/minion %{buildroot}%{_sysconfdir}/salt/minion install -p -m 0640 conf/minion %{buildroot}%{_sysconfdir}/%{name}/minion
install -p -m 0640 conf/master %{buildroot}%{_sysconfdir}/salt/master install -p -m 0640 conf/master %{buildroot}%{_sysconfdir}/%{name}/master
install -p -m 0600 conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud install -p -m 0600 conf/cloud %{buildroot}%{_sysconfdir}/%{name}/cloud
install -p -m 0640 conf/roster %{buildroot}%{_sysconfdir}/salt/roster install -p -m 0640 conf/roster %{buildroot}%{_sysconfdir}/%{name}/roster
install -p -m 0640 conf/proxy %{buildroot}%{_sysconfdir}/salt/proxy install -p -m 0640 conf/proxy %{buildroot}%{_sysconfdir}/%{name}/proxy
# Add the unit files # Add the unit files
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
@ -243,229 +182,146 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
# Logrotate # Logrotate
install -p %{SOURCE10} . install -p %{SOURCE10} .
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
install -p -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/logrotate.d/salt install -p -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
# Bash completion # Bash completion
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/ mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
install -p -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/bash_completion.d/salt.bash install -p -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}.bash
# Fish completion (TBD remove -v) # Fish completion (TBD remove -v)
mkdir -p %{buildroot}%{fish_dir} mkdir -p %{buildroot}%{fish_dir}
install -p -m 0644 %{SOURCE13} %{buildroot}%{fish_dir}/salt.fish install -p -m 0644 %{SOURCE13} %{buildroot}%{fish_dir}/%{name}.fish
install -p -m 0644 %{SOURCE14} %{buildroot}%{fish_dir}/salt_common.fish install -p -m 0644 %{SOURCE14} %{buildroot}%{fish_dir}/%{name}_common.fish
install -p -m 0644 %{SOURCE15} %{buildroot}%{fish_dir}/salt-call.fish install -p -m 0644 %{SOURCE15} %{buildroot}%{fish_dir}/%{name}-call.fish
install -p -m 0644 %{SOURCE16} %{buildroot}%{fish_dir}/salt-cp.fish install -p -m 0644 %{SOURCE16} %{buildroot}%{fish_dir}/%{name}-cp.fish
install -p -m 0644 %{SOURCE17} %{buildroot}%{fish_dir}/salt-key.fish install -p -m 0644 %{SOURCE17} %{buildroot}%{fish_dir}/%{name}-key.fish
install -p -m 0644 %{SOURCE18} %{buildroot}%{fish_dir}/salt-master.fish install -p -m 0644 %{SOURCE18} %{buildroot}%{fish_dir}/%{name}-master.fish
install -p -m 0644 %{SOURCE19} %{buildroot}%{fish_dir}/salt-minion.fish install -p -m 0644 %{SOURCE19} %{buildroot}%{fish_dir}/%{name}-minion.fish
install -p -m 0644 %{SOURCE20} %{buildroot}%{fish_dir}/salt-run.fish install -p -m 0644 %{SOURCE20} %{buildroot}%{fish_dir}/%{name}-run.fish
install -p -m 0644 %{SOURCE21} %{buildroot}%{fish_dir}/salt-syndic.fish install -p -m 0644 %{SOURCE21} %{buildroot}%{fish_dir}/%{name}-syndic.fish
# ZSH completion # ZSH completion
mkdir -p %{buildroot}%{zsh_dir} mkdir -p %{buildroot}%{zsh_dir}
install -p -m 0644 pkg/salt.zsh %{buildroot}%{zsh_dir}/_salt install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
popd
%clean
rm -rf %{buildroot}
%check
%pyproject_check_import -t
%files
%defattr(-,root,root,-)
%{python3_sitelib}/%{name}/*
%{python3_sitelib}/%{name}-*-py%{python3_version}.egg-info
%{_sysconfdir}/logrotate.d/salt
%{_sysconfdir}/bash_completion.d/salt.bash
%{_var}/cache/salt
%{_var}/log/salt
%{zsh_dir}
%doc $RPM_BUILD_DIR/python3-%{name}-%{version}-%{release}/LICENSE %files -f %{pyproject_files}
%doc $RPM_BUILD_DIR/python3-%{name}-%{version}-%{release}/README.fedora %license LICENSE
%doc README.fedora
/%{_bindir}/spm %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}.bash
%{_var}/cache/%{name}
%{_var}/log/%{name}
%{_bindir}/spm
%doc %{_mandir}/man1/spm.1* %doc %{_mandir}/man1/spm.1*
%config(noreplace) %{_sysconfdir}/salt/ %dir %{zsh_dir}
%config(noreplace) %{_sysconfdir}/salt/pki %dir %{_sysconfdir}/%{name}/
%config(noreplace) %{fish_dir}/salt*.fish %dir %{_sysconfdir}/%{name}/pki/
%config(noreplace) %{zsh_dir}/_salt %{fish_dir}/%{name}*.fish
%{zsh_dir}/_%{name}
%files master %files master
%defattr(-,root,root) %doc %{_mandir}/man7/%{name}.7*
%doc %{_mandir}/man7/salt.7* %doc %{_mandir}/man1/%{name}.1*
%doc %{_mandir}/man1/salt.1* %doc %{_mandir}/man1/%{name}-cp.1*
%doc %{_mandir}/man1/salt-cp.1* %doc %{_mandir}/man1/%{name}-key.1*
%doc %{_mandir}/man1/salt-key.1* %doc %{_mandir}/man1/%{name}-master.1*
%doc %{_mandir}/man1/salt-master.1* %doc %{_mandir}/man1/%{name}-run.1*
%doc %{_mandir}/man1/salt-run.1* %doc %{_mandir}/man1/%{name}-unity.1*
%doc %{_mandir}/man1/salt-unity.1* %{_bindir}/%{name}
%{_bindir}/salt %{_bindir}/%{name}-cp
%{_bindir}/salt-cp %{_bindir}/%{name}-key
%{_bindir}/salt-key %{_bindir}/%{name}-master
%{_bindir}/salt-master %{_bindir}/%{name}-run
%{_bindir}/salt-run %{_bindir}/%{name}-unity
%{_bindir}/salt-unity %{_unitdir}/%{name}-master.service
%{_unitdir}/salt-master.service %config(noreplace) %{_sysconfdir}/%{name}/master
%config(noreplace) %{_sysconfdir}/salt/master %config(noreplace) %{_sysconfdir}/%{name}/master.d
%config(noreplace) %{_sysconfdir}/salt/master.d %config(noreplace) %{_sysconfdir}/%{name}/pki/master
%config(noreplace) %{_sysconfdir}/salt/pki/master
%files minion %files minion
%defattr(-,root,root) %doc %{_mandir}/man1/%{name}-call.1*
%doc %{_mandir}/man1/salt-call.1* %doc %{_mandir}/man1/%{name}-minion.1*
%doc %{_mandir}/man1/salt-minion.1* %doc %{_mandir}/man1/%{name}-proxy.1*
%doc %{_mandir}/man1/salt-proxy.1* %{_bindir}/%{name}-minion
%{_bindir}/salt-minion %{_bindir}/%{name}-call
%{_bindir}/salt-call %{_bindir}/%{name}-proxy
%{_bindir}/salt-proxy %{_unitdir}/%{name}-minion.service
%{_unitdir}/salt-minion.service %{_unitdir}/%{name}-proxy@.service
%{_unitdir}/salt-proxy@.service %config(noreplace) %{_sysconfdir}/%{name}/minion
%config(noreplace) %{_sysconfdir}/salt/minion %config(noreplace) %{_sysconfdir}/%{name}/proxy
%config(noreplace) %{_sysconfdir}/salt/proxy %config(noreplace) %{_sysconfdir}/%{name}/minion.d
%config(noreplace) %{_sysconfdir}/salt/minion.d %config(noreplace) %{_sysconfdir}/%{name}/pki/minion
%config(noreplace) %{_sysconfdir}/salt/pki/minion
%files syndic %files syndic
%doc %{_mandir}/man1/salt-syndic.1* %doc %{_mandir}/man1/%{name}-syndic.1*
%{_bindir}/salt-syndic %{_bindir}/%{name}-syndic
%{_unitdir}/salt-syndic.service %{_unitdir}/%{name}-syndic.service
%files api %files api
%defattr(-,root,root) %doc %{_mandir}/man1/%{name}-api.1*
%doc %{_mandir}/man1/salt-api.1* %{_bindir}/%{name}-api
%{_bindir}/salt-api %{_unitdir}/%{name}-api.service
%{_unitdir}/salt-api.service
%files cloud %files cloud
%doc %{_mandir}/man1/salt-cloud.1* %doc %{_mandir}/man1/%{name}-cloud.1*
%{_bindir}/salt-cloud %{_bindir}/%{name}-cloud
%{_sysconfdir}/salt/cloud.conf.d %{_sysconfdir}/%{name}/cloud.conf.d
%{_sysconfdir}/salt/cloud.deploy.d %{_sysconfdir}/%{name}/cloud.deploy.d
%{_sysconfdir}/salt/cloud.maps.d %{_sysconfdir}/%{name}/cloud.maps.d
%{_sysconfdir}/salt/cloud.profiles.d %{_sysconfdir}/%{name}/cloud.profiles.d
%{_sysconfdir}/salt/cloud.providers.d %{_sysconfdir}/%{name}/cloud.providers.d
%config(noreplace) %{_sysconfdir}/salt/cloud %config(noreplace) %{_sysconfdir}/%{name}/cloud
%files ssh %files ssh
%doc %{_mandir}/man1/salt-ssh.1* %doc %{_mandir}/man1/%{name}-ssh.1*
%{_bindir}/salt-ssh %{_bindir}/%{name}-ssh
%config(noreplace) %{_sysconfdir}/salt/roster %config(noreplace) %{_sysconfdir}/%{name}/roster
# assumes systemd for RHEL 7 & 8 # assumes systemd for RHEL 7 & 8
%preun master %preun master
%if 0%{?systemd_preun:1} %systemd_preun %{name}-syndic.service
%systemd_preun salt-syndic.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable salt-syndic.service > /dev/null 2>&1 || :
/bin/systemctl stop salt-syndic.service > /dev/null 2>&1 || :
fi
%endif
%preun minion %preun minion
%if 0%{?systemd_preun:1} %systemd_preun %{name}-minion.service
%systemd_preun salt-minion.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable salt-minion.service > /dev/null 2>&1 || :
/bin/systemctl stop salt-minion.service > /dev/null 2>&1 || :
fi
%endif
%preun api %preun api
%if 0%{?systemd_preun:1} %systemd_preun %{name}-api.service
%systemd_preun salt-api.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable salt-api.service > /dev/null 2>&1 || :
/bin/systemctl stop salt-api.service > /dev/null 2>&1 || :
fi
%endif
%post master %post master
%if 0%{?systemd_post:1} %systemd_post %{name}-master.service
if [ $1 -gt 1 ] ; then
/usr/bin/systemctl try-restart salt-master.service >/dev/null 2>&1 || :
else
%systemd_post salt-master.service
fi
%else
/bin/systemctl daemon-reload &>/dev/null || :
%endif
%post syndic %post syndic
%if 0%{?systemd_post:1} %systemd_post %{name}-syndic.service
if [ $1 -gt 1 ] ; then
/usr/bin/systemctl try-restart salt-syndic.service >/dev/null 2>&1 || :
else
%systemd_post salt-syndic.service
fi
%else
/bin/systemctl daemon-reload &>/dev/null || :
%endif
%post minion %post minion
%if 0%{?systemd_post:1} %systemd_post %{name}-minion.service
if [ $1 -gt 1 ] ; then
/usr/bin/systemctl try-restart salt-minion.service >/dev/null 2>&1 || :
else
%systemd_post salt-minion.service
fi
%else
/bin/systemctl daemon-reload &>/dev/null || :
%endif
%post api %post api
%if 0%{?systemd_post:1} %systemd_post %{name}-api.service
if [ $1 -gt 1 ] ; then
/usr/bin/systemctl try-restart salt-api.service >/dev/null 2>&1 || :
else
%systemd_post salt-api.service
fi
%else
/bin/systemctl daemon-reload &>/dev/null || :
%endif
%postun master %postun master
%if 0%{?systemd_post:1} %systemd_postun_with_restart %{name}-master.service
%systemd_postun_with_restart salt-master.service
%else
/bin/systemctl daemon-reload &>/dev/null
[ $1 -gt 0 ] && /bin/systemctl try-restart salt-master.service &>/dev/null || :
%endif
%postun syndic %postun syndic
%if 0%{?systemd_post:1} %systemd_postun_with_restart %{name}-syndic.service
%systemd_postun_with_restart salt-syndic.service
%else
/bin/systemctl daemon-reload &>/dev/null
[ $1 -gt 0 ] && /bin/systemctl try-restart salt-syndic.service &>/dev/null || :
%endif
%postun minion %postun minion
%if 0%{?systemd_post:1} %systemd_postun_with_restart %{name}-minion.service
%systemd_postun_with_restart salt-minion.service
%else
/bin/systemctl daemon-reload &>/dev/null
[ $1 -gt 0 ] && /bin/systemctl try-restart salt-minion.service &>/dev/null || :
%endif
%postun api %postun api
%if 0%{?systemd_post:1} %systemd_postun_with_restart %{name}-api.service
%systemd_postun_with_restart salt-api.service
%else
/bin/systemctl daemon-reload &>/dev/null
[ $1 -gt 0 ] && /bin/systemctl try-restart salt-api.service &>/dev/null || :
%endif
%changelog %changelog
* Thu Jul 28 2022 Robby Callicotte <rcallicotte@fedoraproject.org> - 3004.2-3
- Cleaned up specfile
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3004.2-2 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3004.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Write Preview
Loading…
Cancel
Save