[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r574: clear up divergence locally

[R P Herrold]

------------------------------------------------------------
revno: 574 [merge]
committer: R P Herrold <herrold at owlriver.com>
branch nick: lsb-puppet
timestamp: Thu 2014-05-22 15:29:45 -0400
message:
  clear up divergence locally
modified:
  manifests/nodes/lsb1.pp
  manifests/nodes/lsb2.pp
  modules/buildbot/manifests/master.pp
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'manifests/nodes/lsb1.pp'
--- a/manifests/nodes/lsb1.pp	2014-04-25 21:33:37 +0000
+++ b/manifests/nodes/lsb1.pp	2014-05-01 19:44:38 +0000
@@ -17,7 +17,7 @@
 
     include alien
 
-    include mail::linuxbase
+    include mail::postfix
 
     include buildbot::master
 

=== modified file 'manifests/nodes/lsb2.pp'
--- a/manifests/nodes/lsb2.pp	2014-04-05 02:32:21 +0000
+++ b/manifests/nodes/lsb2.pp	2014-05-01 18:41:02 +0000
@@ -8,6 +8,6 @@
 
     include puppet::server
 
-    include mail::postfix
+    include mail::linuxbase
 
 }

=== modified file 'modules/buildbot/manifests/master.pp'
--- a/modules/buildbot/manifests/master.pp	2014-04-26 00:33:54 +0000
+++ b/modules/buildbot/manifests/master.pp	2014-05-09 15:43:01 +0000
@@ -4,7 +4,7 @@
 
     include buildbotpw
 
-    $buildbotconfigrev = 'revid:licquia at linuxfoundation.org-20140423200521-sabh09dot05nfcxk'
+    $buildbotconfigrev = 'revid:licquia at linuxfoundation.org-20140509154043-ovatueczfovn3mft'
 
     $weeklyrebuildarchs = 'x86,x86_64,ia64,ppc32,ppc64'
 

=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2014-04-15 19:13:21 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2014-04-28 15:42:42 +0000
@@ -57,6 +57,10 @@
         default      => 'gcc-c++',
     }
 
+    $cppdevelpkg = $operatingsystem ? {
+        default => 'libstdc++-devel',
+    }
+
     # Java package, needed by OLVER.  On ia64, SuSE does not ship a
     # decent JRE, so you have to download the ia64 JRE directly from
     # Oracle.
@@ -337,9 +341,9 @@
 
     # Most packages needed for a typical slave; see the definitions
     # above for $fontutilpkg and $xdevelpkg for the interesting ones.
-    $pkglist = [ "$rpmpkg", "$gpluspluspkg", "$pkgconfigpkg", 'cvs',
-                 "$javapkg", 'autoconf', "$automakepkg", 'libtool', "$bisonpkg",
-                 'flex', "$xgettextpkg", 'rsync', "$intltoolpkg",
+    $pkglist = [ "$rpmpkg", "$gpluspluspkg", "$cppdevelpkg", "$pkgconfigpkg",
+                 'cvs', "$javapkg", 'autoconf', "$automakepkg", 'libtool',
+                 "$bisonpkg", 'flex', "$xgettextpkg", 'rsync', "$intltoolpkg",
                  "$glibdevelpkg", "$pamdevelpkg", "$expectpkg",
                  "$expatdevelpkg", 'perl', "$libcstaticpkg", 
                  'ncurses-devel', "$libxsltpkg", "$printprotopkg" ]