[salt] updated to upstream release 0.12.1
Clint Savage
herlo at fedoraproject.org
Sat Feb 2 08:36:04 UTC 2013
commit 202e45dbffee093e79fcd1d065c891a89d23c9f9
Author: Clint Savage <herlo1 at gmail.com>
Date: Sat Feb 2 01:35:18 2013 -0700
updated to upstream release 0.12.1
.gitignore | 1 +
salt.spec | 24 +++++++++++++++++-------
sources | 1 +
3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5430d0..18398b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/salt-0.11.0.tar.gz
/salt-0.11.1.tar.gz
/salt-0.12.0.tar.gz
+/salt-0.12.1.tar.gz
diff --git a/salt.spec b/salt.spec
index f6e3a5b..162e152 100644
--- a/salt.spec
+++ b/salt.spec
@@ -1,5 +1,6 @@
%if ! (0%{?rhel} >= 6 || 0%{?fedora} > 12)
%global with_python26 1
+%global include_tests 0
%define pybasever 2.6
%define __python_ver 26
%define __python %{_bindir}/python%{?pybasever}
@@ -9,7 +10,7 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: salt
-Version: 0.12.0
+Version: 0.12.1
Release: 1%{?dist}
Summary: A parallel remote execution system
@@ -24,8 +25,6 @@ Source4: %{name}-master.service
Source5: %{name}-syndic.service
Source6: %{name}-minion.service
Source7: README.fedora
-Patch0: 0003-Late-stage-jinja2-dependency.patch
-Patch1: 0004-Jinja2-no-longer-build-dep.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +43,7 @@ BuildRequires: python26-devel
BuildRequires: python26-PyYAML
BuildRequires: python26-m2crypto
BuildRequires: python26-msgpack
+BuildRequires: python26-jinja2
Requires: python26-crypto
Requires: python26-zmq
@@ -61,6 +61,11 @@ BuildRequires: PyYAML
BuildRequires: m2crypto
BuildRequires: python-msgpack
+%if 0%{?include_tests}
+BuildRequires: python-unittest2
+%endif
+BuildRequires: python-jinja2
+
Requires: python-crypto
Requires: python-zmq
Requires: python-jinja2
@@ -120,9 +125,6 @@ Salt minion is queried and controlled from the master.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-
%build
@@ -147,7 +149,12 @@ install -p %{SOURCE7} .
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/salt/
install -p -m 0640 conf/minion $RPM_BUILD_ROOT%{_sysconfdir}/salt/minion
install -p -m 0640 conf/master $RPM_BUILD_ROOT%{_sysconfdir}/salt/master
-
+
+%if 0%{?include_tests}
+%check
+%{__python} setup.py test
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -296,6 +303,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Jan 17 2013 Wendall Cada <wendallc at 83864.com> - 0.12.0-2
+- Added unittest support
+
* Wed Jan 16 2013 Clint Savage <herlo1 at gmail.com> - 0.12.0-1
- Upstream release 0.12.0
diff --git a/sources b/sources
index afef645..c5c360c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
56f586d9b1717bd414aa9657b6ee064b salt-0.12.0.tar.gz
+693338c0a47138c8a7ec3564712a7035 salt-0.12.1.tar.gz
More information about the scm-commits
mailing list