Accepting request 308421 from devel:languages:python

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/308421
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=45

salt-2014.7.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:474d0a23866e42c664f46e04bc8ead87fc57ee16ff2cc8945248f1e0706f6eb8
-size 3845643

salt-2015.5.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0d5b3ec220d8c956120bf2faa00bb7013e500eef7a697bc428cb179a136a5d2
+size 4432164

salt.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Fri May 15 21:04:44 UTC 2015 - aboe76@gmail.com
+
+- Removed python-pssh depency not needed anymore.
+
+-------------------------------------------------------------------
+Wed May  6 20:33:53 UTC 2015 - aboe76@gmail.com
+
+- Major release 2015.5.0 Lithium
+- update to 2015.5.0
+  The 2015.5.0 feature release of Salt is focused on hardening Salt
+  and mostly on improving existing systems. A few major additions
+  are present, primarily the new Beacon system. Most enhancements
+  have been focused around improving existing features and
+  interfaces.
+
+  As usual the release notes are not exhaustive and primarily
+  include the most notable additions and improvements. Hundreds of
+  bugs have been fixed and many modules have been substantially
+  updated and added.
+
+
+  See especially the warning right on the top regarding
+  python_shell=False.
+
+  For all details see
+   http://docs.saltstack.com/en/latest/topics/releases/2015.5.0.html
+- RPM Package changes:
+- add some versions to the buildrequires to match the 2
+  requirements files from the tarball
+- Moved the depencencies to main salt package
+  except where they are specific for the package
+- Changed python-request dependency,only needed on salt-cloud
+- Added python-tornado dependency for http.py
+- Fixed zsh_completion in tarball.
+- Fixed salt-api requirements to require python-cherrypy
+- Fixed salt-cloud requiments to require salt-master
+
 -------------------------------------------------------------------
 Sun Apr 19 17:48:05 UTC 2015 - aboe76@gmail.com
 

salt.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           salt
-Version:        2014.7.5
+Version:        2015.5.0
 Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
@@ -24,9 +24,6 @@ Group:          System/Monitoring
 Url:            http://saltstack.org/
 Source0:        http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
 
-# FIX_UPSTREAM_TARBALL no zsh completion
-Source1:		zsh_completion.zsh
-
 # PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
 Patch1:         use-forking-daemon.patch
 
@@ -38,10 +35,11 @@ BuildRequires:  python-M2Crypto
 BuildRequires:  python-PyYAML
 BuildRequires:  python-apache-libcloud >= 0.14.0
 BuildRequires:  python-devel
-BuildRequires:  python-msgpack-python
+BuildRequires:  python-msgpack-python > 0.3
 BuildRequires:  python-psutil
 BuildRequires:  python-pycrypto
-BuildRequires:  python-pyzmq
+BuildRequires:  python-pyzmq >= 2.2.0
+BuildRequires:  python-tornado
 BuildRequires:  python-requests >= 1.0.0
 BuildRequires:  python-yaml
 
@@ -60,24 +58,23 @@ BuildRequires:  python-pip
 BuildRequires:  python-salt-testing
 BuildRequires:  python-unittest2
 BuildRequires:  python-xml
-%if 0%{?suse_version} >= 1210
-BuildRequires:  python-pssh
-%{?systemd_requires}
-%endif
 
 #for docs
 BuildRequires:  python-sphinx
 
 Requires:       logrotate
 Requires:       python-Jinja2
+Requires:		python-M2Crypto
 Requires:       python-PyYAML
 Requires:       python-apache-libcloud
+Requires:		python-msgpack-python
 Requires:       python-psutil
-Requires:       python-requests
+Requires:       python-tornado
 Requires:       python-xml
 Requires:       python-yaml
-Requires:       python-yaml
 Requires:       python-zypp
+Requires:		python-pyzmq
+Requires:		python-pycrypto
 Requires(pre): %fillup_prereq
 %if 0%{?suse_version} < 1210
 Requires(pre): %insserv_prereq
@@ -118,7 +115,7 @@ Summary:        The api for Salt a parallel remote execution system
 Group:          System/Monitoring
 Requires:       %{name} = %{version}
 Requires:       %{name}-master = %{version}
-Recommends:     python-CherryPy
+Requires:	    python-CherryPy
 
 %description api
 salt-api is a modular interface on top of Salt that can provide a variety of entry points into a running Salt system.
@@ -127,8 +124,9 @@ salt-api is a modular interface on top of Salt that can provide a variety of ent
 Summary:        Salt Cloud is a generic cloud provisioning tool
 Group:          System/Monitoring
 Requires:       %{name} = %{version}
-Requires:       python-PyYAML
+Requires:       %{name}-master = %{version}
 Requires:       python-apache-libcloud
+Requires:       python-requests
 Recommends:     python-botocore
 Recommends:     python-netaddr
 
@@ -141,10 +139,6 @@ controlled profile and mapping system.
 Summary:        Documentation for salt, a parallel remote execution system
 Group:          Documentation/HTML
 Requires:       %{name} = %{version}
-Requires:       python-M2Crypto
-Requires:       python-msgpack-python
-Requires:       python-pycrypto
-Requires:       python-pyzmq
 
 %description doc
 Documentation of salt, offline version of http://docs.saltstack.com.
@@ -160,16 +154,11 @@ Recommends:     python-pygit2
 Requires:       git
 Requires:       python-pygit2
 %endif
-Requires:       python-M2Crypto
-Requires:       python-msgpack-python
-Requires:       python-pycrypto
-Requires:       python-pyzmq
 %ifarch %{ix86} x86_64
 %if 0%{?suse_version} && 0%{?sles_version} == 0
 Requires:       dmidecode
 %endif
 %endif
-Recommends:     python-halite
 %if 0%{?suse_version} < 1210
 Requires(pre):  %insserv_prereq
 %endif
@@ -184,10 +173,6 @@ than serially.
 Summary:        Client component for salt, a parallel remote execution system
 Group:          System/Monitoring
 Requires:       %{name} = %{version}
-Requires:       python-M2Crypto
-Requires:       python-msgpack-python
-Requires:       python-pycrypto
-Requires:       python-pyzmq
 %if 0%{?suse_version} < 1210
 Requires(pre):  %insserv_prereq
 %endif
@@ -325,8 +310,7 @@ install -Dpm 0644  pkg/suse/salt.SuSEfirewall2 %{buildroot}%{_sysconfdir}/syscon
 ## install completion scripts
 %if %with_bashcomp
 install -Dpm 0644 pkg/salt.bash %{buildroot}/etc/bash_completion.d/%{name}
-#install -Dpm 0644 scripts/completion/zsh_completion.zsh #%%{buildroot}/etc/zsh_completion.d/#%%{name}
+install -Dpm 0644 pkg/zsh_completion.zsh %{buildroot}/etc/zsh_completion.d/%{name}
-install -Dpm 0644 %{SOURCE1} %{buildroot}/etc/zsh_completion.d/%{name}
 %endif #with_bashcomp
 
 #%%check

zsh_completion.zsh

@@ -1,122 +0,0 @@
-#compdef salt salt-call salt-cp
-
-local state line curcontext="$curcontext"
- 
-salt_dir="${$(python2 -c 'import salt; print(salt.__file__);')%__init__*}"
-_modules(){
-    typeset -a _funcs
-    for file in $salt_dir/modules/*${words[CURRENT]%.*}*.py; do
-        module=${${file##*/}%.py}
-        if ! grep '__virtual__' $file &> /dev/null; then
-            continue
-        fi
-        mod=$(python2 -c "import salt.modules.$module as tmp; print(getattr(tmp, '__virtualname__', '$module'));")
-        for func in $(awk -F'[ (]' '/^def [^_]/ {print $2}' $file); do 
-            _funcs+=($mod.$func)
-        done
-    done
-    _describe modules _funcs
-}
-
-_minions(){
-    _peons=($(salt-key 2>/dev/null | tail -n +2))
-    _describe Minions _peons
-}
-
-_target_options=(
-    '(-E --pcre)'{-E,--pcre}'[use pcre regular expressions]:pcre:'
-    '(-L --list)'{-L,--list}'[take a comma or space delimited list of servers.]:list:'
-    '(-G --grain)'{-G,--grain}'[use a grain value to identify targets]:Grains:'
-    '--grain-pcre[use a grain value to identify targets.]:pcre:'
-    '(-N --nodegroup)'{-N,--nodegroup}'[use one of the predefined nodegroups to identify a list of targets.]:Nodegroup:'
-    '(-R --range)'{-R,--range}'[use a range expression to identify targets.]:Range:'
-    '(-C --compound)'{-C,--compound}'[Use multiple targeting options.]:Compound:'
-    '(-I --pillar)'{-I,--pillar}'[use a pillar value to identify targets.]:Pillar:'
-    '(-S --ipcidr)'{-S,--ipcidr}'[Match based on Subnet (CIDR notation) or IPv4 address.]:Cidr:'
-)
-
-_common_opts=(
-    "--version[show program's version number and exit]"
-    "--versions-report[show program's dependencies version number and exit]"
-    '(-h --help)'{-h,--help}'[show this help message and exit]'
-    '(-c --config-dir)'{-c,--config-dir}'[Pass in an alternative configuration directory.(default: /etc/salt/)]:Config Directory:_files -/'
-    '(-t --timeout)'{-t,--timeout}'[Change the timeout for the running command; default=5]:Timeout (seconds):'
-)
-
-_master_options=(
-    '(-s --static)'{-s,--static}'[Return the data from minions as a group after they all return.]'
-    "--async[Run the salt command but don't wait for a reply]"
-    '(--state-output --state_output)'{--state-output,--state_output}'[Override the configured state_output value for minion output. Default: full]:Outputs:(full terse mixed changes)'
-    '--subset[Execute the routine on a random subset of the targeted minions]:Subset:'
-    '(-v --verbose)'{-v,--verbose}'[Turn on command verbosity, display jid and active job queries]'
-    '--hide-timeout[Hide minions that timeout]'
-    '(-b --batch --batch-size)'{-b,--batch,--batch-size}'[Execute the salt job in batch mode, pass number or percentage to batch.]:Batch Size:'
-    '(-a --auth --eauth --extrenal-auth)'{-a,--auth,--eauth,--external-auth}'[Specify an external authentication system to use.]:eauth:'
-    '(-T --make-token)'{-T,--make-token}'[Generate and save an authentication token for re-use.]'
-    "--return[Set an alternative return method.]:Returners:_path_files -W '$salt_dir/returners' -g '[^_]*.py(\:r)'"
-    '(-d --doc --documentation)'{-d,--doc,--documentation}"[Return the documentation for the specified module]:Module:_path_files -W '$salt_dir/modules' -g '[^_]*.py(\:r)'"
-    '--args-separator[Set the special argument used as a delimiter between command arguments of compound commands.]:Arg separator:'
-)
-
-_minion_options=(
-    "--return[Set an alternative return method.]:Returners:_path_files -W '$salt_dir/returners' -g '[^_]*.py(\:r)'"
-    '(-d --doc --documentation)'{-d,--doc,--documentation}"[Return the documentation for the specified module]:Module:_path_files -W '$salt_dir/modules' -g '[^_]*.py(\:r)'"
-    '(-g --grains)'{-g,--grains}'[Return the information generated by the salt grains]'
-    {*-m,*--module-dirs}'[Specify an additional directory to pull modules from.]:Module Dirs:_files -/'
-    '--master[Specify the master to use.]:Master:'
-    '--local[Run salt-call locally, as if there was no master running.]'
-    '--file-root[Set this directory as the base file root.]:File Root:_files -/'
-    '--pillar-root[Set this directory as the base pillar root.]:Pillar Root:_files -/'
-    '--retcode-passthrough[Exit with the salt call retcode and not the salt binary retcode]'
-    '--id[Specify the minion id to use.]:Minion ID:'
-    '--skip-grains[Do not load grains.]'
-    '--refresh-grains-cache[Force a refresh of the grains cache]'
-)
-
-_logging_options=(
-    '(-l --log-level)'{-l,--log-level}'[Console logging log level.(default: warning)]:Log Level:(all garbage trace debug info warning error critical quiet)'
-    '--log-file[Log file path. Default: /var/log/salt/master.]:Log File:_files'
-    '--log-file-level=[Logfile logging log level.Default: warning]:Log Level:(all garbage trace debug info warning error critical quiet)'
-)
-
-_out_opts=(
-    '(--out --output)'{--out,--output}"[Print the output using the specified outputter.]:Outputters:_path_files -W '$salt_dir/output' -g '[^_]*.py(\:r)'"
-    '(--out-indent --output-indent)'{--out-indent,--output-indent}'[Print the output indented by the provided value in spaces.]:Number:'
-    '(--out-file --output-file)'{--out-file,--output-file}'[Write the output to the specified file]:Output File:_files'
-    '(--no-color --no-colour)'{--no-color,--no-colour}'[Disable all colored output]'
-    '(--force-color --force-colour)'{--force-color,--force-colour}'[Force colored output]'
-)
-
-_salt_comp(){
-    case "$service" in
-        salt)
-            _arguments -C \
-                ':minions:_minions' \
-                ':modules:_modules' \
-                "$_target_options[@]" \
-                "$_common_opts[@]" \
-                "$_master_options[@]" \
-                "$_logging_options[@]" \
-                "$_out_opts[@]"
-            ;;
-        salt-call)
-            _arguments -C \
-                ':modules:_modules' \
-                "$_minion_options[@]" \
-                "$_common_opts[@]" \
-                "$_logging_options[@]" \
-                "$_out_opts[@]"
-            ;;
-        salt-cp)
-            _arguments -C \
-                ':minions:_minions' \
-                "$_target_options[@]" \
-                "$_common_opts[@]" \
-                "$_logging_options[@]" \
-                ':Source File:_files' \
-                ':Destination File:_files'
-            ;;
-    esac
-}
-
-_salt_comp "$@"