From 05f3de07f549545620f1ed45108a83974d491c14ccb004fe31b58c6ac90f4d0a Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 21 Jul 2014 19:40:37 +0000
Subject: [PATCH] Accepting request 241788 from devel:languages:python

1

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

diff --git a/salt.changes b/salt.changes
index a5b5918..4141b10 100644
--- a/salt.changes
+++ b/salt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jul 19 07:58:18 UTC 2014 - aboe76@gmail.com
+
+- Fixed bug in opensuse 12.3 systemd file
+  systemd 198 doesn't have python-systemd binding.
+- Disabled testing on SLES
+
 -------------------------------------------------------------------
 Thu Jul 10 18:25:05 UTC 2014 - aboe76@gmail.com
 
diff --git a/salt.spec b/salt.spec
index 0c56733..2ec69b2 100644
--- a/salt.spec
+++ b/salt.spec
@@ -253,7 +253,12 @@ mkdir -p %{buildroot}/var/log/salt
 mkdir -p %{buildroot}/srv/salt
 mkdir -p %{buildroot}/srv/pillar
 mkdir -p %{buildroot}%{_docdir}/salt
-#
+
+## fix opensuse 12.3 systemd service file
+%if 0%{?suse_version} == 1230
+sed -i 's/^Type=notify/Type=simple/g' pkg/salt-master.service
+%endif
+
 ## install init and systemd scripts
 %if 0%{?_unitdir:1}
 install -Dpm 0644 pkg/salt-master.service %{buildroot}%_unitdir/salt-master.service
@@ -293,10 +298,9 @@ install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}"
 %endif #with_bashcomp
 
 %check
-# don't test on factory because of ssl2 method deprication
-#%%if 0%{?suse_version} < 1310
+%if 0%{?suse_version} < 1310
 %{__python} setup.py test --runtests-opts=-u
-#%%endif
+%endif
 
 %preun syndic
 %if 0%{?_unitdir:1}