Accepting request 354612 from devel:languages:python

1

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

salt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package salt
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -53,11 +53,12 @@ Patch2:         use-salt-user-for-master.patch
 Patch3:         1efe484309a5c776974e723f3da0f5181f4bdb86.patch
 # PATCH-FIX-OPENSUSE detect bad UTF-8 in package header, bsc#958350
 Patch4:         zypper-utf-8.patch
-# PATCH-FIX-OPENSUSE report epoch and architecture
-Patch5:         0001-Add-rpm.minimal_info-fix-rpm.info.patch
-# PATCH-FIX-OPENSUSE use minimal_info for pkg.info_installed
-Patch6:         0002-Reduce-information-returned-from-pkg.info_installed.patch
-
+# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30246
+Patch5:         salt-2015.8-schedule-ret.patch
+# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30267
+Patch6:         salt-2015.8-pkg-zypper-attr-filtering.patch
+# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30384
+Patch7:         salt-2015.8-zypper-info.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  logrotate
 BuildRequires:  python
@@ -105,8 +106,6 @@ Requires(pre):  %{_sbindir}/useradd
 %if 0%{?suse_version}
 Requires(pre):  %fillup_prereq
 Requires(pre):  pwdutils
-# bsc#959572
-Requires:       glibc-locale
 %endif
 Requires:       logrotate
 Requires:       python
@@ -405,6 +404,7 @@ cp %{S:1} .
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 python setup.py --salt-transport=both build