[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r451: Handle png packages on build slaves a bit better.

[Jeff Licquia]

------------------------------------------------------------
revno: 451
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Mon 2013-04-22 22:57:59 -0400
message:
  Handle png packages on build slaves a bit better.
modified:
  modules/buildbot/manifests/slave.pp
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2013-04-23 01:30:14 +0000
+++ b/modules/buildbot/manifests/slave.pp	2013-04-23 02:57:59 +0000
@@ -161,6 +161,7 @@
             $buildbot::slavepkgs::ncurses32pkg: ensure => installed;
             $buildbot::slavepkgs::expat32pkg: ensure => installed;
             $buildbot::slavepkgs::gtk32pkg: ensure => installed;
+            $buildbot::slavepkgs::png32pkg: ensure => installed;
 	}
     }
 

=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2013-04-23 01:30:14 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2013-04-23 02:57:59 +0000
@@ -157,6 +157,10 @@
         default => 'libgtk-2_0-0-32bit',
     }
 
+    $png32pkg = $operatingsysem ? {
+        default => 'libpng12-0-32bit',
+    }
+
     # Apparently, libbat needs the printproto stuff to be
     # installed.  This should be built and used as part of
     # the libbat build; need to investigate.
@@ -234,7 +238,7 @@
         /^SLES/   => 'pango-devel',
         default   => 'pango-devel',
     }
-    $pngpkg = $operatingsystem ? {
+    $pngdevpkg = $operatingsystem ? {
         /^SLES/   => 'libpng-devel',
         default   => 'libpng-devel',
     }
@@ -277,7 +281,7 @@
                     "$cupspkg", "$fontconfigpkg", "$freetypepkg",
                     "$gtkpkg", "$jpegpkg", "$GLpkg",
                     'libxml2-devel', "$nsprpkg", "$nsspkg", "$pangopkg",
-                    "$pngpkg", "$zlibpkg", "$xprotopkg", "$xrenderpkg",
+                    "$pngdevpkg", "$zlibpkg", "$xprotopkg", "$xrenderpkg",
                     "$kernelpkg", "$sanepkg", "$xkbpkg", 'libxslt-devel',
                     "$tiffpkg" ]
     # end devchk