- up to 0.11.1

- removed pld patch (installing lsb-release fixes it)
- renamed to project name

diff --git a/python-salt-grains.patch b/python-salt-grains.patch
deleted file mode 100644 (file)
index 415f2f6..0000000
--- a/python-salt-grains.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- salt-0.9.6/salt/grains/core.py_orig        2012-02-15 10:14:02.313348662 +0000
-+++ salt-0.9.6/salt/grains/core.py     2012-02-15 10:15:23.770014906 +0000
-@@ -355,6 +355,8 @@ def os_data():
-                     grains['lsb_{0}'.format(match.groups()[0].lower())] = match.groups()[1].rstrip()
-         if os.path.isfile('/etc/arch-release'):
-             grains['os'] = 'Arch'
-+        if os.path.isfile('/etc/pld-release'):
-+            grains['os'] = 'PLD Linux'
-         elif os.path.isfile('/etc/debian_version'):
-             grains['os'] = 'Debian'
-             if 'lsb_distrib_id' in grains:

diff --git a/salt-master.service b/salt-master.service
new file mode 100644 (file)
index 0000000..148eeaf
--- /dev/null
+++ b/salt-master.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Salt Master daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/salt-master -d
+Type=simple
+
+[Install]
+WantedBy=multi-user.target

diff --git a/salt-minion.service b/salt-minion.service
new file mode 100644 (file)
index 0000000..3abe473
--- /dev/null
+++ b/salt-minion.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Salt Minion daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/salt-minion -d
+Type=simple
+
+[Install]
+WantedBy=multi-user.target

diff --git a/python-salt.spec b/salt.spec
similarity index 100%
rename from python-salt.spec
rename to salt.spec