[salt] Patched to fix pkgrepo.managed regression
Erik Johnson
terminalmage at fedoraproject.org
Wed Nov 20 15:19:19 UTC 2013
commit d04a7d1bd934a41f5576d0c16568d58014a43518
Author: Erik Johnson <erik at saltstack.com>
Date: Tue Nov 19 23:41:26 2013 -0600
Patched to fix pkgrepo.managed regression
.gitignore | 1 +
salt.spec | 8 ++++++--
sources | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00244a4..2007c7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
/salt-0.17.1.tar.gz
/salt-0.17.2.tar.gz
/SaltTesting-0.5.3.tar.gz
+/issue8560.patch
diff --git a/salt.spec b/salt.spec
index f928d14..005b6b9 100644
--- a/salt.spec
+++ b/salt.spec
@@ -16,7 +16,7 @@
Name: salt
Version: 0.17.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A parallel remote execution system
Group: System Environment/Daemons
@@ -31,6 +31,7 @@ Source5: %{name}-master.service
Source6: %{name}-syndic.service
Source7: %{name}-minion.service
Source8: README.fedora
+Patch0: issue8560.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +51,6 @@ BuildRequires: python26-devel
BuildRequires: python26-jinja2
BuildRequires: python26-m2crypto
BuildRequires: python26-msgpack
-BuildRequires: python26-pip
BuildRequires: python26-zmq
BuildRequires: python26-PyYAML
@@ -137,6 +137,7 @@ Salt minion is queried and controlled from the master.
%prep
%setup -c
+%patch0
%setup -T -D -a 1
%build
@@ -319,6 +320,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Nov 19 2013 Erik Johnson <erik at saltstack.com> - 0.17.2-2
+- Patched to fix pkgrepo.managed regression
+
* Mon Nov 18 2013 Erik Johnson <erik at saltstack.com> - 0.17.2-1
- Update to bugfix release 0.17.2
diff --git a/sources b/sources
index 9c35745..af0922d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
cb61ca768847c2f4d0844fef651a89d1 salt-0.17.2.tar.gz
75b1fdd52e8ffd9368109ac2d7b5f57c SaltTesting-0.5.3.tar.gz
+9a8d055830f36f255377884b0a168826 issue8560.patch
More information about the scm-commits
mailing list