Accepting request 207339 from devel:languages:python

License file now in main package. (forwarded request 207337 from aboe76) OBS-URL: https://build.opensuse.org/request/show/207339 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=20
2013-11-18 09:54:21 +00:00 · 2013-11-18 09:54:21 +00:00 · 3a3d3504c2
commit 3a3d3504c2
parent f9b9240ac4
4 changed files with 126 additions and 23 deletions
--- a/salt-0.17.1.tar.gz
+++ b/salt-0.17.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f9f0e8b2ed53241ab3e373fd8d4030384b3f78f7b796d185c9907874cceebb9
-size 3800422
--- a/salt-0.17.2.tar.gz
+++ b/salt-0.17.2.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1339c02c40b8aa9c55db66bd5780037aa7f6eb4d592fa9e1353e74d1ab167b2
+size 1866629
--- a/salt.changes
+++ b/salt.changes
@ -1,3 +1,77 @@
+-------------------------------------------------------------------
+Fri Nov 15 18:57:46 UTC 2013 - aboe76@gmail.com
+
+- dropped python-urllib3 depency not in factory yet.
+  only needed with saltstack helium and higher
+
+-------------------------------------------------------------------
+Thu Nov 14 22:05:06 UTC 2013 - aboe76@gmail.com
+
+- Updated to salt 0.17.2 Bugfix Release:
+  - Add ability to delete key with grains.delval (issue 7872)
+  - Fix possible state compiler stack trace (issue 5767)
+  - Fix grains targeting for new grains (issue 5737)
+  - Fix bug with merging in git_pillar (issue 6992)
+  - Fix print_jobs duplicate results
+  - Fix possible KeyError from ext_job_cache missing option
+  - Fix auto_order for - names states (issue 7649)
+  - Fix regression in new gitfs installs (directory not found error)
+  - Fix fileclient in case of master restart (issue 7987)
+  - Try to output warning if CLI command malformed (issue 6538)
+  - Fix --out=quiet to actually be quiet (issue 8000)
+  - Fix for state.sls in salt-ssh (issue 7991)
+  - Fix for MySQL grants ordering issue (issue 5817)
+  - Fix traceback for certain missing CLI args (issue 8016)
+  - Add ability to disable lspci queries on master (issue 4906)
+  - Fail if sls defined in topfile does not exist (issue 5998)
+  - Add ability to downgrade MySQL grants (issue 6606)
+  - Fix ssh_auth.absent traceback (issue 8043)
+  - Fix ID-related issues (issue 8052, issue 8050, and others)
+  - Fix for jinja rendering issues (issue 8066 and issue 8079)
+  - Fix argument parsing in salt-ssh (issue 7928)
+  - Fix some GPU detection instances (issue 6945)
+  - Fix bug preventing includes from other environments in SLS files
+  - Fix for kwargs with dashes (issue 8102)
+  - Fix apache.adduser without apachectl (issue 8123)
+  - Fix issue with evaluating test kwarg in states (issue 7788)
+  - Fix regression in salt.client.Caller() (issue 8078)
+  - Fix bug where cmd.script would try to run even if caching failed (issue 7601)
+  - Fix for mine data not being updated (issue 8144)
+  - Fix a Xen detection edge case (issue 7839)
+  - Fix version generation for when it's part of another git repo (issue 8090)
+  - Fix _handle_iorder stacktrace so that the real syntax error is shown (issue 8114 and issue 7905)
+  - Fix git.latest state when a commit SHA is used (issue 8163)
+  - Fix for specifying identify file in git.latest (issue 8094)
+  - Fix for --output-file CLI arg (issue 8205)
+  - Add ability to specify shutdown time for system.shutdown (issue 7833)
+  - Fix for salt version using non-salt git repo info (issue 8266)
+  - Add additional hints at impact of pkgrepo states when test=True (issue 8247)
+  - Fix for salt-ssh files not being owned by root (issue 8216)
+  - Fix retry logic and error handling in fileserver (related to issue 7755)
+  - Fix file.replace with test=True (issue 8279)
+  - Add flag for limiting file traversal in fileserver (issue 6928)
+  - Fix for extra mine processes (issue 5729)
+  - Fix for unloading custom modules (issue 7691)
+  - Fix for salt-ssh opts (issue 8005 and issue 8271)
+  - Fix compound matcher for grains (issue 7944)
+  - Add dir_mode to file.managed (issue 7860)
+  - Improve traceroute support for FreeBSD and OS X (issue 4927)
+  - Fix for matching minions under syndics (issue 7671)
+  - Improve exception handling for missing ID (issue 8259)
+  - Add configuration option for minion_id_caching
+  - Fix open mode auth errors (issue 8402)  
+
+-------------------------------------------------------------------
+Sun Nov 10 07:52:54 UTC 2013 - aboe76@gmail.com
+
+- In preparation of salt Helium all requirements of salt-cloud
+  absorbed in salt
+
+-------------------------------------------------------------------
+Fri Nov  1 07:22:04 UTC 2013 - aboe76@gmail.com
+
+- Added salt-doc package with html documentation of salt
+
 -------------------------------------------------------------------
 Thu Oct 31 21:25:24 UTC 2013 - aboe76@gmail.com

--- a/salt.spec
+++ b/salt.spec
@ -16,7 +16,7 @@
 #

 Name:           salt
-Version:        0.17.1
+Version:        0.17.2
 Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
@ -41,6 +41,8 @@ BuildRequires:  python-PyYAML
 BuildRequires:  python-msgpack-python
 BuildRequires:  python-pycrypto
 BuildRequires:  python-pyzmq
+BuildRequires:  python-apache-libcloud >= 0.12.1
+
 %if 0%{?sles_version}
 BuildRequires:  python
 Requires:       python
@ -57,10 +59,14 @@ BuildRequires:  python-salt-testing
 BuildRequires:  python-mock
 BuildRequires:  python-pip

+#for docs
+BuildRequires:  python-sphinx
+
 Requires:       logrotate
 Requires:       python-Jinja2
 Requires:       python-PyYAML
 Requires:       python-xml
+Requires:       python-apache-libcloud
 Requires(pre): %fillup_prereq
 %if 0%{?suse_version} < 1210
 Requires(pre): %insserv_prereq
@ -73,6 +79,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %endif

+Recommends:     python-botocore
+Recommends:     python-netaddr
+
 %description
 Salt is a distributed remote execution system used to execute commands and
 query data. It was developed in order to bring the best solutions found in
@ -81,6 +90,18 @@ malleable. Salt accomplishes this via its ability to handle larger loads of
 information, and not just dozens, but hundreds or even thousands of individual
 servers, handle them quickly and through a simple and manageable interface.

+%package doc
+Summary:        Documentation for salt, a parallel remote execution system
+Group:          Documentation/HTML
+Requires:       %{name} = %{version}
+Requires:       python-pyzmq
+Requires:       python-M2Crypto
+Requires:       python-msgpack-python
+Requires:       python-pycrypto
+
+%description doc
+Documentation of salt, offline version of http://docs.saltstack.com.
+
 %package master
 Summary:        Management component for salt, a parallel remote execution system
 Group:          System/Monitoring
@ -162,6 +183,9 @@ it enables the management of minions over a ssh connection.
 %build
 python setup.py build

+## documentation
+cd doc && make html && rm _build/html/.buildinfo && cd _build/html && chmod -R -x+X *
+
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}

@ -172,11 +196,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/salt/minion.d
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
 %endif
 mkdir -p %{buildroot}%{_localstatedir}/log/salt
-mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
-mkdir -p %{buildroot}/%{_sbindir}
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
+mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/var/log/salt
 mkdir -p %{buildroot}/srv/salt
 mkdir -p %{buildroot}/srv/pillar
+mkdir -p %{buildroot}%{_docdir}/salt
 #
 ## install init scripts
 %if 0%{?_unitdir:1}
@ -203,18 +228,17 @@ install -Dpm 0644  %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/salt
 ## install SuSEfirewall2 rules
 install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt

-##disabled until assert fixed
-#%%check
-#%%{__python} setup.py test --runtests-opts=-u
+%check
+%{__python} setup.py test --runtests-opts=-u

-%preun -n salt-syndic
+%preun syndic
 %if 0%{?_unitdir:1}
 %service_del_preun salt-syndic.service
 %else
 %stop_on_removal salt-syndic
 %endif

-%post -n salt-syndic
+%post syndic
 %if 0%{?_unitdir:1}
 %service_add_post salt-syndic.service
 %fillup_only
@ -222,7 +246,7 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %fillup_and_insserv
 %endif

-%postun -n salt-syndic
+%postun syndic
 %if 0%{?_unitdir:1}
 %service_del_postun salt-syndic.service
 %else
@ -230,14 +254,14 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %restart_on_update salt-syndic
 %endif

-%preun -n salt-master
+%preun master
 %if 0%{?_unitdir:1}
 %service_del_preun salt-master.service
 %else
 %stop_on_removal salt-master
 %endif

-%post -n salt-master
+%post master
 %if 0%{?_unitdir:1}
 %service_add_post salt-master.service
 %fillup_only
@ -245,7 +269,7 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %fillup_and_insserv
 %endif

-%postun -n salt-master
+%postun master
 %if 0%{?_unitdir:1}
 %service_del_postun salt-master.service
 %else
@ -253,14 +277,14 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %insserv_cleanup
 %endif

-%preun -n salt-minion
+%preun minion
 %if 0%{?_unitdir:1}
 %service_del_preun salt-minion.service
 %else
 %stop_on_removal salt-minion
 %endif

-%post -n salt-minion
+%post minion
 %if 0%{?_unitdir:1}
 %service_add_post salt-minion.service
 %fillup_only
@ -268,7 +292,7 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %fillup_and_insserv
 %endif

-%postun -n salt-minion
+%postun minion
 %if 0%{?_unitdir:1}
 %service_del_postun salt-minion.service
 %else
@ -276,12 +300,12 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %restart_on_update salt-minion
 %endif

-%files -n salt-ssh
+%files ssh
 %defattr(-,root,root)
 %{_bindir}/salt-ssh
 %{_mandir}/man1/salt-ssh.1.gz

-%files -n salt-syndic
+%files syndic
 %defattr(-,root,root)
 %{_bindir}/salt-syndic
 %{_mandir}/man1/salt-syndic.1.gz
@ -292,7 +316,7 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %{_sysconfdir}/init.d/salt-syndic
 %endif

-%files -n salt-minion
+%files minion
 %defattr(-,root,root)
 %{_bindir}/salt-minion
 %{_mandir}/man1/salt-minion.1.gz
@ -305,7 +329,7 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %config(noreplace) %{_sysconfdir}/init.d/salt-minion
 %endif

-%files -n salt-master
+%files master
 %defattr(-,root,root)
 %{_bindir}/salt
 %{_bindir}/salt-master
@ -329,9 +353,12 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %config(noreplace) %{_sysconfdir}/init.d/salt-master
 %endif

+%files doc
+%defattr(-,root,root)
+%doc doc/_build/html
+
 %files
 %defattr(-,root,root,-)
-%doc LICENSE AUTHORS README.rst HACKING.rst
 %dir %{_sysconfdir}/salt
 %dir /var/log/salt
 %{_bindir}/salt-call
@ -339,5 +366,7 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %{_mandir}/man7/salt.7.gz
 %config(noreplace) %{_sysconfdir}/logrotate.d/salt
 %{python_sitelib}/*
+%doc LICENSE AUTHORS README.rst HACKING.rst 
+

 %changelog