[csw-devel] SF.net SVN: gar:[16279] csw/mgar/pkg/ganglia/trunk/Makefile

[d_pocock at users.sourceforge.net]

Revision: 16279
          http://gar.svn.sourceforge.net/gar/?rev=16279&view=rev
Author:   d_pocock
Date:     2011-11-25 12:25:48 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
ganglia: make changes recommended by checkpkg

Modified Paths:
--------------
    csw/mgar/pkg/ganglia/trunk/Makefile

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2011-11-25 12:25:48 UTC (rev 16278)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2011-11-25 12:25:48 UTC (rev 16279)
@@ -26,21 +26,21 @@
 DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove
 DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad
 
-PACKAGES = CSWlibganglia0 CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython
+PACKAGES = CSWlibganglia0 CSWgangliaagent CSWganglia-dev CSWgangliagmetad CSWgangliaweb CSWgangliamodpython
 
 CATALOGNAME_CSWganglia		= ganglia
 CATALOGNAME_CSWlibganglia0	= libganglia0
-CATALOGNAME_CSWgangliaagent	= ganglia_agent
-CATALOGNAME_CSWgangliamodpython	= ganglia_modpython
-CATALOGNAME_CSWgangliadevel	= ganglia_devel
-CATALOGNAME_CSWgangliagmetad	= ganglia_gmetad
-CATALOGNAME_CSWgangliaweb	= ganglia_web
+CATALOGNAME_CSWgangliaagent	= gangliaagent
+CATALOGNAME_CSWgangliamodpython	= gangliamodpython
+CATALOGNAME_CSWganglia-dev	= ganglia-dev
+CATALOGNAME_CSWgangliagmetad	= gangliagmetad
+CATALOGNAME_CSWgangliaweb	= gangliaweb
 
 SPKG_DESC_CSWganglia		= Dummy package
 SPKG_DESC_CSWlibganglia0		= Ganglia runtime libraries
 SPKG_DESC_CSWgangliaagent	= Ganglia performance monitoring agent gmond
 SPKG_DESC_CSWgangliamodpython	= Ganglia agent module for Python metrics
-SPKG_DESC_CSWgangliadevel	= Ganglia headers for metric module development
+SPKG_DESC_CSWganglia-dev	= Ganglia headers for metric module development
 SPKG_DESC_CSWgangliagmetad	= Ganglia gmetad
 SPKG_DESC_CSWgangliaweb		= Ganglia web
 
@@ -51,14 +51,17 @@
 RUNTIME_DEP_PKGS_CSWlibganglia0 += CSWlibpcre0
 RUNTIME_DEP_PKGS_CSWgangliaagent = CSWlibexpat1 CSWlibconfuse CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWgangliaagent += CSWlibganglia0 CSWlibpcre0
-RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWlibconfuse CSWlibapr1-0 CSWlibganglia0
-RUNTIME_DEP_PKGS_CSWgangliamodpython += CSWgangliaagent
-RUNTIME_DEP_PKGS_CSWgangliadevel = CSWlibexpat0 CSWlibconfuse CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWgangliaagent
+RUNTIME_DEP_PKGS_CSWganglia-dev = CSWlibganglia0
 RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWlibexpat1 CSWlibconfuse CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibganglia0 CSWgangliaagent CSWrrdtool
 RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibrrd4 CSWlibpcre0
+CHECKPKG_OVERRIDES_CSWgangliagmetad += surplus-dependency|CSWrrdtool
 RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad 
 RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2-modphp5 CSWrrdtool
+CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWgangliagmetad
+CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWrrdtool
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021
@@ -133,10 +136,12 @@
 ETCGANGLIA = $(sysconfdir)
 
 PKGFILES_CSWganglia = 
-PKGFILES_CSWlibganglia0 = $(libdir)/libganglia.so.*
+PKGFILES_CSWgangliaagent = .*/bin/gmond .*/bin/gmetric
+PKGFILES_CSWlibganglia0 = $(call pkgfiles_lib,libganglia-3.1.7.so.0)
+CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.1.7.so.0.0.0|soname=libganglia-3.1.7.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-1-7-0
 PKGFILES_CSWgangliamodpython = .*python.*
-PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config $(libdir)/libganglia.so
-PKGFILES_CSWgangliagmetad = .*/gmetad.* /var/opt/csw/ganglia/rrds /etc/opt/csw/init.d/cswgmetad
+PKGFILES_CSWganglia-dev = .*/include/.*.h .*/bin/ganglia-config $(libdir)/libganglia.so
+PKGFILES_CSWgangliagmetad = .*/bin/gmetad .*/gmetad.* /var/opt/csw/ganglia/rrds /etc/opt/csw/init.d/cswgmetad
 PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.*
 
 PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
@@ -163,6 +168,7 @@
 include gar/category.mk
 
 install-custom:
+	@rm $(DESTDIR)/opt/csw/bin/gstat
 	@ginstall -D $(DOWNLOADDIR)/cswgmond \
 		$(PKGROOT)/etc/opt/csw/init.d/cswgmond
 	@ginstall -D $(DOWNLOADDIR)/cswgmetad \

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