SF.net SVN: gar:[24578] csw/mgar/pkg/puppet3/trunk/Makefile

[tosmi at users.sourceforge.net]

Revision: 24578
          http://sourceforge.net/p/gar/code/24578
Author:   tosmi
Date:     2015-01-19 20:57:07 +0000 (Mon, 19 Jan 2015)
Log Message:
-----------
puppet: cleanup some checkpkg overrides

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

Modified: csw/mgar/pkg/puppet3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet3/trunk/Makefile	2015-01-19 20:07:09 UTC (rev 24577)
+++ csw/mgar/pkg/puppet3/trunk/Makefile	2015-01-19 20:57:07 UTC (rev 24578)
@@ -45,8 +45,9 @@
 # service isn't started upon the installation of CSWpuppet.
 PACKAGES += CSWpuppetmaster3
 SPKG_DESC_CSWpuppetmaster3 = System configuration management tool, server
-RUNTIME_DEP_PKGS_CSWpuppetmaster3 = $(RUNTIME_DEP_PKGS)
-BUILD_DEP_PKGS_CSWpuppet3 = $(RUNTIME_DEP_PKGS_CSWpuppet3)
+RUNTIME_DEP_PKGS_CSWpuppetmaster3 += CSWhiera
+RUNTIME_DEP_PKGS_CSWpuppetmaster3 += CSWruby20
+BUILD_DEP_PKGS_CSWpuppetmaster3 = $(RUNTIME_DEP_PKGS_CSWpuppetmaster3)
 
 INCOMPATIBLE_PKGS += CSWpuppet
 INCOMPATIBLE_PKGS += CSWpuppetmaster
@@ -68,9 +69,6 @@
 TEST_SCRIPTS      =
 INSTALL_SCRIPTS   = puppet
 
-CHECKPKG_OVERRIDES_CSWpuppet3 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
-CHECKPKG_OVERRIDES_CSWpuppet3 += surplus-dependency|CSWruby20
-CHECKPKG_OVERRIDES_CSWpuppet3 += surplus-dependency|CSWrubyaugeas
 CHECKPKG_OVERRIDES_CSWpuppet3 += surplus-dependency|CSWfacter
 CHECKPKG_OVERRIDES_CSWpuppet3 += surplus-dependency|CSWhiera
 # Puppet has hardcoded paths to look at for many OSes, many of which involve
@@ -87,9 +85,6 @@
 # INCOMPATIBLE_PKGS
 CHECKPKG_OVERRIDES_CSWpuppet3 += file-collision
 
-CHECKPKG_OVERRIDES_CSWpuppetmaster3 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
-CHECKPKG_OVERRIDES_CSWpuppetmaster3 += surplus-dependency|CSWrubyaugeas
-CHECKPKG_OVERRIDES_CSWpuppetmaster3 += surplus-dependency|CSWfacter
 CHECKPKG_OVERRIDES_CSWpuppetmaster3 += surplus-dependency|CSWhiera
 CHECKPKG_OVERRIDES_CSWpuppetmaster3 += surplus-dependency|CSWruby20
 # yes, yes, we know it conflicts with puppet{,master} - that's the point of

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