SF.net SVN: gar:[24599] csw/mgar/pkg/ansible/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Jan 29 16:35:27 CET 2015


Revision: 24599
          http://sourceforge.net/p/gar/code/24599
Author:   dmichelsen
Date:     2015-01-29 15:35:26 +0000 (Thu, 29 Jan 2015)
Log Message:
-----------
ansible/trunk: Move to release tarball, otherwise core and extra modules are missing, general cleanup

Modified Paths:
--------------
    csw/mgar/pkg/ansible/trunk/Makefile
    csw/mgar/pkg/ansible/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/ansible/trunk/files/README.CSW

Modified: csw/mgar/pkg/ansible/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ansible/trunk/Makefile	2015-01-28 15:02:31 UTC (rev 24598)
+++ csw/mgar/pkg/ansible/trunk/Makefile	2015-01-29 15:35:26 UTC (rev 24599)
@@ -7,22 +7,32 @@
 define BLURB
 endef
 
-GITHUB_USER     =       ansible
-GITHUB_REFERENCE=       release$(VERSION)
-MASTER_SITES    =       $(GITHUB_MIRROR)
-DISTNAME	=	$(GITHUB_USER)-$(NAME)-6f568bd
-DISTFILES       =       $(GITHUB_REFERENCE)$(GITHUB_BALL_EXT)
-DISTFILES	+=	README.CSW
-DISTFILES	+=	hosts.CSW
+MASTER_SITES += http://releases.ansible.com/ansible/
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += hosts.CSW
 
-PACKAGES     = CSWansible
-CATALOGNAME  = ansible
+PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch
+PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch
+
+PACKAGES += CSWansible
+# Stick with upstream naming
 CHECKPKG_OVERRIDES_CSWansible += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWansible += catalogname-does-not-start-with-py_
+SPKG_DESC_CSWansible = Deploy, manage, and orchestrate computer systems
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWansible += CSWpython
+RUNTIME_DEP_PKGS_CSWansible = CSWpy-jinja2
+RUNTIME_DEP_PKGS_CSWansible += CSWpy-markupsafe
+RUNTIME_DEP_PKGS_CSWansible += CSWpy-yaml
+RUNTIME_DEP_PKGS_CSWansible += CSWpy-paramiko
+RUNTIME_DEP_PKGS_CSWansible += CSWopenssh-client
+# checkpkg cannot detect these
+CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-markupsafe
+CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml
+CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-paramiko
+CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWopenssh-client
+CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2
 
-PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch
-PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch
-
 # There are many OS specific (Linux, FreeBSD, etc.) paths stored in those files.
 CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_common.py
 CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/callbacks.py
@@ -32,28 +42,32 @@
 CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/basic.py
 CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py
 CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew_tap.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew_cask.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/pkgng.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/language/composer.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/monitoring/nagios.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/monitoring/logentries.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/language/pip.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/os/yum.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/cloud/amazon/s3.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/cloud/google/gc_storage.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/files/unarchive.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/system/service.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/alternatives.py
+CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/os/rhn_register.py
 
-CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml
-CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWopenssh-client
-CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2
-CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-markupsafe
-
-REINPLACEMENTS = etc
+REINPLACEMENTS += etc
 REINPLACE_MATCH_etc = /etc/ansible
 REINPLACE_WITH_etc  = /etc/opt/csw/ansible
 REINPLACE_FILES_etc = lib/ansible/constants.py
 
 REINPLACEMENTS += usr
 REINPLACE_MATCH_usr = /usr/share/ansible
-REINPLACE_WITH_usr  = /opt/csw/share/ansible
+REINPLACE_WITH_usr = /opt/csw/share/ansible
 REINPLACE_FILES_usr = lib/ansible/constants.py
 
-RUNTIME_DEP_PKGS  = CSWpython
-RUNTIME_DEP_PKGS  = CSWpy-jinja2
-RUNTIME_DEP_PKGS += CSWpy-markupsafe
-RUNTIME_DEP_PKGS += CSWpy-yaml
-RUNTIME_DEP_PKGS += CSWopenssh-client
-
 ARCHALL = 1
 
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/ansible/trunk/checksums
===================================================================
--- csw/mgar/pkg/ansible/trunk/checksums	2015-01-28 15:02:31 UTC (rev 24598)
+++ csw/mgar/pkg/ansible/trunk/checksums	2015-01-29 15:35:26 UTC (rev 24599)
@@ -1 +1,2 @@
-74911fe25193f2f8799bfd78599876a8  release1.8.2.tar.gz
+33d96058f7b52794fe8dd34fa4f37a80  README.CSW
+c2ac0e5a4c092dfa84c7e9e51cd45095  ansible-1.8.2.tar.gz

Deleted: csw/mgar/pkg/ansible/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/ansible/trunk/files/README.CSW	2015-01-28 15:02:31 UTC (rev 24598)
+++ csw/mgar/pkg/ansible/trunk/files/README.CSW	2015-01-29 15:35:26 UTC (rev 24599)
@@ -1,19 +0,0 @@
-Note
-====
-
-OpenCSW Ansible does not support  Paramiko as a connection method, due
-to  lack of  a Paramiko  OpenCSW package.  Therefore, OpenCSW  Ansible
-requires    an    SSH   implementation    supporting    ControlPersist
-functionality,  which  is  provided  by  the  OpenCSW  OpenSSH  Client
-package.
-
-In order  to make to  make use of  the OpenCSW OpenSSH  Client, please
-make  sure  /opt/csw/bin  is  listed  before  /usr/bin  in  your  PATH
-environment variable, e.g.
-
-
-  PATH=/opt/csw/bin:$PATH ansible ...
-
-
-Or you  might follow  the instructions given  in the  section `Setting
-your PATH' on http://www.opencsw.org/use-it/.

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



More information about the devel mailing list