From 3a8e1e73195482a5b5d7f607e2c0bfe7ccb551f2 Mon Sep 17 00:00:00 2001 From: David Murphy < dmurphy@saltstack.com> Date: Thu, 15 Dec 2016 11:28:33 -0700 Subject: [PATCH] Update to feature release 2016.11.1 --- .gitignore | 1 + salt-api | 1 + salt.spec | 147 ++++++++++++++++++++++++++++++++++------------------- sources | 4 +- 4 files changed, 98 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index a8a01cf..ffebd27 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /SaltTesting-2016.10.26.tar.gz /salt-2016.3.4.tar.gz /salt-2016.11.0.tar.gz +/salt-2016.11.1.tar.gz diff --git a/salt-api b/salt-api index fe467de..87067a1 100644 --- a/salt-api +++ b/salt-api @@ -125,6 +125,7 @@ case "$1" in echo -n "Checking for service salt-api " checkproc $SALTAPI rc_status -v + RETVAL=$? elif [ -f $DEBIAN_VERSION ]; then if [ -f $LOCKFILE ]; then RETVAL=0 diff --git a/salt.spec b/salt.spec index 5c39f62..d5941a1 100644 --- a/salt.spec +++ b/salt.spec @@ -1,3 +1,19 @@ +%if ( "0%{?dist}" == "0.amzn1" ) +%global with_explicit_python27 1 +%global pybasever 2.7 +%global __python_ver 27 +%global __python %{_bindir}/python%{?pybasever} +%global __python2 %{_bindir}/python%{?pybasever} + +%global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") +%global python2_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") + +%{!?pythonpath: %global pythonpath %(%{__python} -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")} + +%global __inst_layout --install-layout=unix + +%else + %if ! (0%{?rhel} >= 6 || 0%{?fedora} > 12) %global with_python26 1 %define pybasever 2.6 @@ -5,17 +21,21 @@ %define __python %{_bindir}/python%{?pybasever} %endif +%{!?python2_sitelib: %global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?pythonpath: %global pythonpath %(%{__python} -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")} + +%endif + %global include_tests 0 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?pythonpath: %global pythonpath %(%{__python} -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")} +%define fish_dir %{_datadir}/fish/vendor_functions.d %define _salttesting SaltTesting %define _salttesting_ver 2016.10.26 Name: salt -Version: 2016.11.0 +Version: 2016.11.1 Release: 1%{?dist} Summary: A parallel remote execution system @@ -99,17 +119,21 @@ BuildRequires: python-argparse %endif -BuildRequires: python-devel -Requires: python-crypto >= 2.6.1 -Requires: python-jinja2 -Requires: python-msgpack > 0.3 +BuildRequires: python%{?__python_ver}-devel +Requires: python%{?__python_ver}-crypto >= 2.6.1 +Requires: python%{?__python_ver}-jinja2 +Requires: python%{?__python_ver}-msgpack > 0.3 +%if ( "0%{?dist}" == "0.amzn1" ) +Requires: python27-PyYAML +%else Requires: PyYAML -Requires: python-requests >= 1.0.0 -Requires: python-zmq -Requires: python-markupsafe -Requires: python-tornado >= 4.2.1 -Requires: python-futures >= 2.0 -Requires: python-six +%endif +Requires: python%{?__python_ver}-requests >= 1.0.0 +Requires: python%{?__python_ver}-zmq +Requires: python%{?__python_ver}-markupsafe +Requires: python%{?__python_ver}-tornado >= 4.2.1 +Requires: python%{?__python_ver}-futures >= 2.0 +Requires: python%{?__python_ver}-six %endif @@ -176,12 +200,12 @@ infrastructure. %package api Summary: REST API for Salt, a parallel remote execution system -Group: System administration tools +Group: Applications/System Requires: %{name}-master = %{version}-%{release} %if 0%{?with_python26} Requires: python26-cherrypy %else -Requires: python-cherrypy +Requires: python%{?__python_ver}-cherrypy %endif @@ -190,12 +214,12 @@ salt-api provides a REST interface to the Salt master. %package cloud Summary: Cloud provisioner for Salt, a parallel remote execution system -Group: System administration tools +Group: Applications/System Requires: %{name}-master = %{version}-%{release} %if 0%{?with_python26} Requires: python26-libcloud %else -Requires: python-libcloud +Requires: python%{?__python_ver}-libcloud %endif %description cloud @@ -204,7 +228,7 @@ adds them to the master's collection of controllable minions. %package ssh Summary: Agentless SSH-based version of Salt, a parallel remote execution system -Group: System administration tools +Group: Applications/System Requires: %{name} = %{version}-%{release} %description ssh @@ -212,8 +236,8 @@ The salt-ssh tool can run remote execution functions and states without the use of an agent (salt-minion) service. %prep -%setup -c -%setup -T -D -a 1 +%setup -q -c +%setup -q -T -D -a 1 cd %{name}-%{version} ## %%patch0 -p1 @@ -224,7 +248,7 @@ cd %{name}-%{version} %install rm -rf %{buildroot} cd $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -%{__python} setup.py install -O1 --root %{buildroot} +%{__python} setup.py install -O1 %{?__inst_layout } --root %{buildroot} # Add some directories install -d -m 0755 %{buildroot}%{_var}/log/salt @@ -284,16 +308,16 @@ mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/ install -p -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/bash_completion.d/salt.bash # Fish completion (TBD remove -v) -mkdir -p %{buildroot}%{_datadir}/fish/vendor_functions.d/ -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt.fish -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt_common.fish -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt-call.fish -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt-cp.fish -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt-key.fish -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt-master.fish -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt-minion.fish -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt-run.fish -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_functions.d/salt-syndic.fish +mkdir -p %{buildroot}%{fish_dir} +install -p -m 0644 %{SOURCE13} %{buildroot}%{fish_dir}/salt.fish +install -p -m 0644 %{SOURCE14} %{buildroot}%{fish_dir}/salt_common.fish +install -p -m 0644 %{SOURCE15} %{buildroot}%{fish_dir}/salt-call.fish +install -p -m 0644 %{SOURCE16} %{buildroot}%{fish_dir}/salt-cp.fish +install -p -m 0644 %{SOURCE17} %{buildroot}%{fish_dir}/salt-key.fish +install -p -m 0644 %{SOURCE18} %{buildroot}%{fish_dir}/salt-master.fish +install -p -m 0644 %{SOURCE19} %{buildroot}%{fish_dir}/salt-minion.fish +install -p -m 0644 %{SOURCE20} %{buildroot}%{fish_dir}/salt-run.fish +install -p -m 0644 %{SOURCE21} %{buildroot}%{fish_dir}/salt-syndic.fish %if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests}) %check @@ -308,29 +332,35 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/LICENSE -%{python_sitelib}/%{name}/* -#%%{python_sitelib}/%%{name}-%%{version}-py?.?.egg-info -%{python_sitelib}/%{name}-*-py?.?.egg-info +%{python2_sitelib}/%{name}/* +#%%{python2_sitelib}/%%{name}-%%{version}-py?.?.egg-info + +%if ( "0%{?dist}" == "0.amzn1" ) +%{python2_sitelib}/%{name}-%{version}.egg-info +%else +%{python2_sitelib}/%{name}-*-py?.?.egg-info +%endif + %{_sysconfdir}/logrotate.d/salt %{_sysconfdir}/bash_completion.d/salt.bash %{_var}/cache/salt %{_var}/log/salt %doc $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/README.fedora %{_bindir}/spm -%doc %{_mandir}/man1/spm.1.* +%doc %{_mandir}/man1/spm.1* %config(noreplace) %{_sysconfdir}/salt/ %config(noreplace) %{_sysconfdir}/salt/pki -%config(noreplace) %{_datadir}/fish/vendor_functions.d/salt*.fish +%config(noreplace) %{fish_dir}/salt*.fish %files master %defattr(-,root,root) -%doc %{_mandir}/man7/salt.7.* -%doc %{_mandir}/man1/salt.1.* -%doc %{_mandir}/man1/salt-cp.1.* -%doc %{_mandir}/man1/salt-key.1.* -%doc %{_mandir}/man1/salt-master.1.* -%doc %{_mandir}/man1/salt-run.1.* -%doc %{_mandir}/man1/salt-unity.1.* +%doc %{_mandir}/man7/salt.7* +%doc %{_mandir}/man1/salt.1* +%doc %{_mandir}/man1/salt-cp.1* +%doc %{_mandir}/man1/salt-key.1* +%doc %{_mandir}/man1/salt-master.1* +%doc %{_mandir}/man1/salt-run.1* +%doc %{_mandir}/man1/salt-unity.1* %{_bindir}/salt %{_bindir}/salt-cp %{_bindir}/salt-key @@ -349,9 +379,9 @@ rm -rf %{buildroot} %files minion %defattr(-,root,root) -%doc %{_mandir}/man1/salt-call.1.* -%doc %{_mandir}/man1/salt-minion.1.* -%doc %{_mandir}/man1/salt-proxy.1.* +%doc %{_mandir}/man1/salt-call.1* +%doc %{_mandir}/man1/salt-minion.1* +%doc %{_mandir}/man1/salt-proxy.1* %{_bindir}/salt-minion %{_bindir}/salt-call %{_bindir}/salt-proxy @@ -364,11 +394,10 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/salt/proxy %config(noreplace) %{_sysconfdir}/salt/minion.d %config(noreplace) %{_sysconfdir}/salt/pki/minion -%config(noreplace) %{_sysconfdir}/salt/proxy.d %config(noreplace) %{_var}/log/salt/minion %files syndic -%doc %{_mandir}/man1/salt-syndic.1.* +%doc %{_mandir}/man1/salt-syndic.1* %{_bindir}/salt-syndic %if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) %attr(0755, root, root) %{_initrddir}/salt-syndic @@ -378,7 +407,7 @@ rm -rf %{buildroot} %files api %defattr(-,root,root) -%doc %{_mandir}/man1/salt-api.1.* +%doc %{_mandir}/man1/salt-api.1* %{_bindir}/salt-api %if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) %attr(0755, root, root) %{_initrddir}/salt-api @@ -387,7 +416,7 @@ rm -rf %{buildroot} %endif %files cloud -%doc %{_mandir}/man1/salt-cloud.1.* +%doc %{_mandir}/man1/salt-cloud.1* %{_bindir}/salt-cloud %{_sysconfdir}/salt/cloud.conf.d %{_sysconfdir}/salt/cloud.deploy.d @@ -397,7 +426,7 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/salt/cloud %files ssh -%doc %{_mandir}/man1/salt-ssh.1.* +%doc %{_mandir}/man1/salt-ssh.1* %{_bindir}/salt-ssh %config(noreplace) %{_sysconfdir}/salt/roster @@ -529,15 +558,27 @@ rm -rf %{buildroot} %endif %changelog +* Tue Dec 13 2016 SaltStack Packaging Team - 2016.11.1-1 +- Update to feature release 2016.11.1 + +* Wed Nov 30 2016 SaltStack Packaging Team - 2016.11.0-2 +- Adjust for single spec for Redhat family and fish-completions + * Tue Nov 22 2016 SaltStack Packaging Team - 2016.11.0-1 - Update to feature release 2016.11.0 * Wed Nov 2 2016 SaltStack Packaging Team - 2016.11.0-0.rc2 - Update to feature release 2016.11.0 Release Candidate 2 -* Fri Oct 7 2016 SaltStack Packaging Team - 2016.11.0-0.rc1 +* Wed Oct 26 2016 SaltStack Packaging Team - 2016.11.0-0.rc1 - Update to feature release 2016.11.0 Release Candidate 1 +* Fri Oct 14 2016 SaltStack Packaging Team - 2016.3.3-4 +- Ported to build on Amazon Linux 2016.09 natively + +* Mon Sep 12 2016 SaltStack Packaging Team - 2016.3.3-3 +- Adjust spec file for Fedora 24 support + * Tue Aug 30 2016 SaltStack Packaging Team - 2016.3.3-2 - Fix systemd update of existing installation diff --git a/sources b/sources index 6eae310..a7440ad 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -671fb2020ef3ebb8281ec536d0fcb9b1 SaltTesting-2016.10.26.tar.gz -eced07a652cc6a31870fc098d5325a9c salt-2016.11.0.tar.gz +SHA512 (SaltTesting-2016.10.26.tar.gz) = 0817d3738992bb1e89728a9cd939056bc919de9c995445aac8820f895204e0f14df4cff989c46456b382180e3a1685827a113dbb609518e88c6b944f9222698a +SHA512 (salt-2016.11.1.tar.gz) = 77ac9a676a14c367005c9821136a2842d515d0c19b5f64d95a5c447f83baac99e6d0da3d9554942467a0bfa5bb620f742432bc19e2e1f78af61ccebc72b89748