[csw-devel] SF.net SVN: gar:[20564] csw/mgar/pkg/lang-python/salt/trunk

[romeotheriault at users.sourceforge.net]

Revision: 20564
          http://gar.svn.sourceforge.net/gar/?rev=20564&view=rev
Author:   romeotheriault
Date:     2013-04-02 00:26:52 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
lang-python/salt/trunk: version bump to 0.14.0

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/salt/trunk/Makefile
    csw/mgar/pkg/lang-python/salt/trunk/checksums

Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/Makefile	2013-04-01 20:52:54 UTC (rev 20563)
+++ csw/mgar/pkg/lang-python/salt/trunk/Makefile	2013-04-02 00:26:52 UTC (rev 20564)
@@ -1,5 +1,5 @@
 NAME = salt
-VERSION = 0.10.4
+VERSION = 0.14.0
 GARTYPE = v2
 CATEGORIES = python
 
@@ -8,7 +8,7 @@
   Salt is a distributed remote execution system used to execute commands and query data. 
 endef
 
-MASTER_SITES = https://github.com/downloads/saltstack/salt/
+MASTER_SITES = http://pypi.python.org/packages/source/s/salt/
 DISTFILES += $(DISTNAME).tar.gz
 DISTFILES += salt-minion
 DISTFILES += salt-master
@@ -44,18 +44,16 @@
 include gar/category.mk
 
 post-install-modulated: CONFDEST = $(DESTDIR)$(sysconfdir)/salt
-post-install-modulated: CONFS = minion.template master.template 
+post-install-modulated: CONFS = minion master
 post-install-modulated:
 
 	# Copy config files (upstream)
 	ginstall -d $(CONFDEST)
 	cp $(addprefix $(WORKSRC)/conf/,$(CONFS)) $(CONFDEST)
-	gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/master.template
-	gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/minion.template
-	gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/master.template
-	gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/minion.template
-	mv $(CONFDEST)/minion.template $(CONFDEST)/minion
-	mv $(CONFDEST)/master.template $(CONFDEST)/master
+	gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/master
+	gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/minion
+	gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/master
+	gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/minion
 	# Copy init script in place
 	ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(DOWNLOADDIR)/salt-minion $(DESTDIR)$(sysconfdir)/init.d

Modified: csw/mgar/pkg/lang-python/salt/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/checksums	2013-04-01 20:52:54 UTC (rev 20563)
+++ csw/mgar/pkg/lang-python/salt/trunk/checksums	2013-04-02 00:26:52 UTC (rev 20564)
@@ -1 +1 @@
-18022f153f9071d605483d3c92862e48  salt-0.10.4.tar.gz
+0f9fa32f208356e41ac8e0976e927b41  salt-0.14.0.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.