|
|
@ -45,7 +45,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
Name: salt
|
|
|
|
Name: salt
|
|
|
|
Version: 2018.3.2%{?__rc_ver}
|
|
|
|
Version: 2018.3.2%{?__rc_ver}
|
|
|
|
Release: 4%{?dist}
|
|
|
|
Release: 5%{?dist}
|
|
|
|
Summary: A parallel remote execution system
|
|
|
|
Summary: A parallel remote execution system
|
|
|
|
|
|
|
|
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Group: System Environment/Daemons
|
|
|
@ -301,21 +301,6 @@ install -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/
|
|
|
|
install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
|
|
|
|
install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
## # Force python2.7 on EPEL6
|
|
|
|
|
|
|
|
## # https://github.com/saltstack/salt/issues/22003
|
|
|
|
|
|
|
|
## %if 0%{?rhel} == 6
|
|
|
|
|
|
|
|
## sed -i 's#/usr/bin/python#/usr/bin/python2.7#g' %{buildroot}%{_bindir}/spm
|
|
|
|
|
|
|
|
## sed -i 's#/usr/bin/python#/usr/bin/python2.7#g' %{buildroot}%{_bindir}/salt*
|
|
|
|
|
|
|
|
## sed -i 's#/usr/bin/python#/usr/bin/python2.7#g' %{buildroot}%{_initrddir}/salt*
|
|
|
|
|
|
|
|
## %endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if 0%{?fedora} >= 28
|
|
|
|
|
|
|
|
sed -i 's#/usr/bin/python#/usr/bin/python2.7#g' %{buildroot}%{_bindir}/spm
|
|
|
|
|
|
|
|
sed -i 's#/usr/bin/python#/usr/bin/python2.7#g' %{buildroot}%{_bindir}/salt*
|
|
|
|
|
|
|
|
## sed -i 's#/usr/bin/python#/usr/bin/python2.7#g' %{buildroot}%{_initrddir}/salt*
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Logrotate
|
|
|
|
# Logrotate
|
|
|
|
install -p %{SOURCE10} .
|
|
|
|
install -p %{SOURCE10} .
|
|
|
|
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
|
|
|
|
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
|
|
|
@ -632,6 +617,9 @@ rm -rf %{buildroot}
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
|
|
|
|
* Tue Jul 24 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.2-5
|
|
|
|
|
|
|
|
- Fix version of python used, multiple addition of 2.7
|
|
|
|
|
|
|
|
|
|
|
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.3.2-4
|
|
|
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.3.2-4
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|