[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r495: Revert last change; the glut issue isn't with installed packages.

[Jeff Licquia]

------------------------------------------------------------
revno: 495
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2013-07-11 13:18:23 -0400
message:
  Revert last change; the glut issue isn't with installed packages.
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-07-11 15:35:29 +0000
+++ b/modules/buildbot/manifests/slave.pp	2013-07-11 17:18:23 +0000
@@ -171,7 +171,6 @@
             $buildbot::slavepkgs::gtk32pkg: ensure => installed;
             $buildbot::slavepkgs::png32pkg: ensure => installed;
             $buildbot::slavepkgs::xdevel32pkg: ensure => installed;
-            $buildbot::slavepkgs::glut32pkg: ensure => installed;
 	}
     }
 

=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2013-07-11 15:35:29 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2013-07-11 17:18:23 +0000
@@ -187,11 +187,6 @@
         default          => 'libpng12-0-32bit',
     }
 
-    $glut32pkg = "$operatingsystem-$architecture" ? {
-        /^Fedora-s390x$/ => 'freeglut-devel.s390',
-        default          => 'freeglut-devel-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.
@@ -332,7 +327,6 @@
                  'flex', "$xgettextpkg", 'rsync', "$intltoolpkg",
                  "$glibdevelpkg", "$pamdevelpkg", "$expectpkg",
                  "$expatdevelpkg", 'perl', "$libcstaticpkg", 
-                 'ncurses-devel', "$libxsltpkg", "$printprotopkg",
-                 'freeglut-devel' ]
+                 'ncurses-devel', "$libxsltpkg", "$printprotopkg" ]
 
 }