SF.net SVN: gar:[24671] csw/mgar/pkg/buildbot/trunk

[dmichelsen at users.sourceforge.net]

Revision: 24671
          http://sourceforge.net/p/gar/code/24671
Author:   dmichelsen
Date:     2015-02-21 14:45:52 +0000 (Sat, 21 Feb 2015)
Log Message:
-----------
buildbot/trunk: Update to 0.8.10, add SMF manifest

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

Added Paths:
-----------
    csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml

Removed Paths:
-------------
    csw/mgar/pkg/buildbot/trunk/files/buildbot

Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile	2015-02-21 14:41:58 UTC (rev 24670)
+++ csw/mgar/pkg/buildbot/trunk/Makefile	2015-02-21 14:45:52 UTC (rev 24671)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = buildbot
-VERSION = 0.8.8
+VERSION = 0.8.10
 CATEGORIES = python
 GARTYPE = v2
 
@@ -24,9 +24,9 @@
 
 MASTER_SITES = $(PYPI_MIRROR)
 DISTFILES += $(DISTNAME).tar.gz
-# Wrapper
-DISTFILES += buildbot
 
+DISTFILES += cswbuildbot.xml
+
 # Buildbot is 2.7 only and the server is Solaris 10 only
 MODULATIONS_PYTHON_VERSION = 2_7
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -40,10 +40,6 @@
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-tempita
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-decorator
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-openssl
-# This is in fact an old 0.7.10 version private to buildbot. The documentation says
-#   "The requirement to install SQLAlchemy-0.7.10 is due to a conflict between newer
-#    versions of SQLAlchemy and SQLAlchemy-Migrate."
-RUNTIME_DEP_PKGS_CSWbuildbot += CSWbuildbot-sqlalchemy
 
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-zope-interface
@@ -53,26 +49,21 @@
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-openssl
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWbuildbot-sqlalchemy
 
+# That is the URI for the DTD
+CHECKPKG_OVERRIDES_CSWbuildbot += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswbuildbot.xml
+
 # This is more like an application than a python module
 CHECKPKG_OVERRIDES_CSWbuildbot += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWbuildbot += catalogname-does-not-start-with-py_
 
 ARCHALL_CSWbuildbot = 1
 
-# logwatcher uses 'tail -f -n 0' only available on XPG4 tail or GNU tail, let's prefer XPG4
-REINPLACEMENTS += tail
-REINPLACE_MATCH_tail = /usr/bin/tail
-REINPLACE_WITH_tail = /usr/xpg4/bin/tail
-REINPLACE_FILES_tail += buildbot/scripts/logwatcher.py
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswbuildbot.xml
+PROTOTYPE_CLASS_smf = manifest
 
-# There seems to be 'trial' missing
-SKIPTEST ?= 1
-
 include gar/category.mk
 
 post-install:
-	ginstall -d $(DESTDIR)$(libexecdir)
-	mv $(DESTDIR)$(bindir)/buildbot $(DESTDIR)$(libexecdir)/buildbot
-	ginstall -m 0755 $(WORKDIR)/buildbot $(DESTDIR)$(bindir)/buildbot
+	ginstall -D -m 0644 $(WORKDIR)/cswbuildbot.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswbuildbot.xml
 	@$(MAKECOOKIE)
-	

Modified: csw/mgar/pkg/buildbot/trunk/checksums
===================================================================
--- csw/mgar/pkg/buildbot/trunk/checksums	2015-02-21 14:41:58 UTC (rev 24670)
+++ csw/mgar/pkg/buildbot/trunk/checksums	2015-02-21 14:45:52 UTC (rev 24671)
@@ -1 +1 @@
-472f512584bbb18cc677ca2ec3b3a905  buildbot-0.8.8.tar.gz
+3201aaecf32df7810f4e23c14d20a544  buildbot-0.8.10.tar.gz

Deleted: csw/mgar/pkg/buildbot/trunk/files/buildbot
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/buildbot	2015-02-21 14:41:58 UTC (rev 24670)
+++ csw/mgar/pkg/buildbot/trunk/files/buildbot	2015-02-21 14:45:52 UTC (rev 24671)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-PYTHONPATH=/opt/csw/share/buildbot/lib/python2.7/site-packages
-export PYTHONPATH
-exec /opt/csw/libexec/buildbot "$@"

Added: csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml
===================================================================
(Binary files differ)

Index: csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml	2015-02-21 14:41:58 UTC (rev 24670)
+++ csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml	2015-02-21 14:45:52 UTC (rev 24671)

Property changes on: csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.