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

[romeotheriault at users.sourceforge.net]

Revision: 19095
          http://gar.svn.sourceforge.net/gar/?rev=19095&view=rev
Author:   romeotheriault
Date:     2012-08-26 05:56:35 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
lang-python/salt/trunk: updated to 0.10.2 and copy config files into place.

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	2012-08-25 16:56:43 UTC (rev 19094)
+++ csw/mgar/pkg/lang-python/salt/trunk/Makefile	2012-08-26 05:56:35 UTC (rev 19095)
@@ -1,8 +1,7 @@
 #TODO:
 # * Create init scripts
-# * Have mgar copy the minion.template and master.template files into place. (salt-0.10.1/conf/)
 NAME = salt
-VERSION = 0.10.1
+VERSION = 0.10.2
 GARTYPE = v2
 CATEGORIES = python
 
@@ -18,15 +17,17 @@
 RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-m2crypto
 RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-crypto
 RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-jinja2
-#RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-pyzmq
-#RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-msgpack
+RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-pyzmq
+RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-msgpack-python
 
+#CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted
+
 CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-m2crypto
 CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-yaml
 CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-crypto
 CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-jinja2
-#CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-pyzmq
-#CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-msgpack
+CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-pyzmq
+CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-msgpack-python
 
 CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/share/man/man7/salt.7
 CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/cron.py
@@ -35,6 +36,10 @@
 CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/brew.py
 CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/pip.py
 CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/salt/modules/tomcat.py
+CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/states/pkgng.py
+CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/pkgng.py
+CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/poudriere.py
+CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/cassandra.py
 
 ARCHALL_CSWpy-salt = 1
 
@@ -43,3 +48,14 @@
 TEST_SCRIPTS =
 
 include gar/category.mk
+
+post-install-modulated: CONFDEST = $(DESTDIR)$(sysconfdir)/salt
+post-install-modulated: CONFS = minion.template master.template 
+post-install-modulated:
+
+	# Copy config files (upstream)
+	ginstall -d $(CONFDEST)
+	cp $(addprefix $(WORKSRC)/conf/,$(CONFS)) $(CONFDEST)
+
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/lang-python/salt/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/checksums	2012-08-25 16:56:43 UTC (rev 19094)
+++ csw/mgar/pkg/lang-python/salt/trunk/checksums	2012-08-26 05:56:35 UTC (rev 19095)
@@ -1 +1 @@
-ff55b82d64429938ffe1097b77a71188  salt-0.10.1.tar.gz
+fbef8746177f60caa47364f0163a393e  salt-0.10.2.tar.gz

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