From 1640c97ade54dbd06526cffd48aa30f0d464767334cd64b9420d80d936f2801d Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 22 Nov 2013 06:29:28 +0000
Subject: [PATCH] Accepting request 207876 from devel:languages:python

- Add bugzilla for solved issues

- Updated to salt 0.17.1 bugfix release (bnc#849205, bnc#849204, bnc#849184):

OBS-URL: https://build.opensuse.org/request/show/207876
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=21
---
 salt.changes |  7 ++++++-
 salt.spec    | 31 +++++++++++++++----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/salt.changes b/salt.changes
index 0d6caaa..18b30ee 100644
--- a/salt.changes
+++ b/salt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 21 15:33:06 UTC 2013 - speilicke@suse.com
+
+- Add bugzilla for solved issues
+
 -------------------------------------------------------------------
 Fri Nov 15 18:57:46 UTC 2013 - aboe76@gmail.com
 
@@ -92,7 +97,7 @@ Fri Oct 18 11:24:28 UTC 2013 - p.drouand@gmail.com
 -------------------------------------------------------------------
 Thu Oct 17 18:27:23 UTC 2013 - aboe76@gmail.com
 
-- Updated to salt 0.17.1 bugfix release:
+- Updated to salt 0.17.1 bugfix release (bnc#849205, bnc#849204, bnc#849184):
   - Fix symbolic links in thin.tgz (:issue:`7482`)
   - Pass env through to file.patch state (:issue:`7452`)
   - Service provider fixes and reporting improvements (:issue:`7361`)
diff --git a/salt.spec b/salt.spec
index b371873..eb71c89 100644
--- a/salt.spec
+++ b/salt.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           salt
 Version:        0.17.2
 Release:        0
@@ -33,15 +34,15 @@ Source7:        %{name}.logrotate
 Source8:        %{name}.SuSEfirewall2
 
 #for building
-BuildRequires:  python-devel
 BuildRequires:  logrotate
 BuildRequires:  python-Jinja2
 BuildRequires:  python-M2Crypto
 BuildRequires:  python-PyYAML
+BuildRequires:  python-apache-libcloud >= 0.12.1
+BuildRequires:  python-devel
 BuildRequires:  python-msgpack-python
 BuildRequires:  python-pycrypto
 BuildRequires:  python-pyzmq
-BuildRequires:  python-apache-libcloud >= 0.12.1
 
 %if 0%{?sles_version}
 BuildRequires:  python
@@ -53,11 +54,11 @@ BuildRequires:  systemd
 %endif
 
 #for testing
-BuildRequires:  python-xml
-BuildRequires:  python-unittest2
-BuildRequires:  python-salt-testing
 BuildRequires:  python-mock
 BuildRequires:  python-pip
+BuildRequires:  python-salt-testing
+BuildRequires:  python-unittest2
+BuildRequires:  python-xml
 
 #for docs
 BuildRequires:  python-sphinx
@@ -65,8 +66,8 @@ BuildRequires:  python-sphinx
 Requires:       logrotate
 Requires:       python-Jinja2
 Requires:       python-PyYAML
-Requires:       python-xml
 Requires:       python-apache-libcloud
+Requires:       python-xml
 Requires(pre): %fillup_prereq
 %if 0%{?suse_version} < 1210
 Requires(pre): %insserv_prereq
@@ -94,10 +95,10 @@ servers, handle them quickly and through a simple and manageable interface.
 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
+Requires:       python-pyzmq
 
 %description doc
 Documentation of salt, offline version of http://docs.saltstack.com.
@@ -106,24 +107,23 @@ Documentation of salt, offline version of http://docs.saltstack.com.
 Summary:        Management component for salt, a parallel remote execution system
 Group:          System/Monitoring
 Requires:       %{name} = %{version}
-Requires:       python-pyzmq
+Requires:       git
+Requires:       python-GitPython
 Requires:       python-M2Crypto
 Requires:       python-msgpack-python
 Requires:       python-pycrypto
-Requires:		python-GitPython
-Requires:		git
+Requires:       python-pyzmq
 %ifarch %{ix86} x86_64
 %if 0%{?suse_version} && 0%{?sles_version} == 0
 Requires:       dmidecode
 %endif
 %endif
-Recommends:		python-halite
+Recommends:     python-halite
 %if 0%{?suse_version} < 1210
 Requires(pre):  %insserv_prereq
 %endif
 Requires(pre):  %fillup_prereq
 
-
 %description master
 The Salt master is the central server to which all minions connect.
 Enabled commands to remote systems to be called in parallel rather
@@ -133,10 +133,10 @@ than serially.
 Summary:        Client component for salt, a parallel remote execution system
 Group:          System/Monitoring
 Requires:       %{name} = %{version}
-Requires:       python-pyzmq
 Requires:       python-M2Crypto
 Requires:       python-msgpack-python
 Requires:       python-pycrypto
+Requires:       python-pyzmq
 %if 0%{?suse_version} < 1210
 Requires(pre):  %insserv_prereq
 %endif
@@ -167,7 +167,7 @@ Group:          System/Monitoring
 Requires:       %{name} = %{version}
 BuildRequires:  python-markupsafe
 Requires:       python-markupsafe
-Recommends:		sshpass
+Recommends:     sshpass
 %if 0%{?suse_version} < 1210
 Requires(pre):  %insserv_prereq
 %endif
@@ -368,5 +368,4 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %{python_sitelib}/*
 %doc LICENSE AUTHORS README.rst HACKING.rst 
 
-
-%changelog
\ No newline at end of file
+%changelog