[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r410: Rework font packages needed for building X11-related things.

Jeff Licquia licquia at linuxfoundation.org
Wed Mar 13 17:43:50 UTC 2013


------------------------------------------------------------
revno: 410
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Wed 2013-03-13 13:43:50 -0400
message:
  Rework font packages needed for building X11-related things.
  
   - Got rid of separate ucs2any definition only for non-Red-Hat systems.
  
   - Renamed bdftopcf variable to reflect its role as the "font utils
     package list", and added the ucs2any information to it.
  
   - Added mkfontdir and mkfontscale for OpenSuSE, which are now their
     own 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-02-15 17:20:05 +0000
+++ b/modules/buildbot/manifests/slave.pp	2013-03-13 17:43:50 +0000
@@ -105,13 +105,6 @@
         package { "${name}": ensure => installed }
     }
 
-    # On Red Hat systems, this is the same package as $bdftocfpkg.
-    if $operatingsystem !~ /^(Fedora|CentOS)$/ {
-        package { "$buildbot::slavepkgs::ucs2anypkg":
-            ensure => present,
-        }
-    }
-
     # Declare most of the package dependencies from buildbot::slavepkgs
     # in one fell swoop.
 
@@ -119,6 +112,8 @@
 
     install-pkglist { $buildbot::slavepkgs::xdevelpkg: }
 
+    install-pkglist { $buildbot::slavepkgs::fontutilpkg: }
+
     install-pkglist { $buildbot::slavepkgs::pkglist: }
 
     # Get special LSB packages needed for builds.

=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2013-03-12 03:06:57 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2013-03-13 17:43:50 +0000
@@ -24,21 +24,11 @@
     }
 
     # this one for xts5 and lsb-xvfb
-    $bdftopcfpkg = $operatingsystem ? {
-        /^Fedora$/ => 'xorg-x11-font-utils',
-        /^CentOS$/ => 'xorg-x11-font-utils',
-        /^SLES/ => 'xorg-x11',
-        default => 'bdftopcf',
-    }
-
-    # for lsb-xvfb
-    # NOTE: on Red Hat-based systems, this is the same as $bdftopcfpkg,
-    # so don't include it 
-    $ucs2anypkg = $operatingsystem ? {
+    $fontutilpkg = $operatingsystem ? {
         /^Fedora$/  => 'xorg-x11-font-utils',
         /^CentOS$/  => 'xorg-x11-font-utils',
-        /^SLES/     => 'xorg-x11-fonts-devel',
-        /^OpenSuSE/ => 'font-util',
+        /^SLES/     => ['xorg-x11', 'xorg-x11-fonts-devel'],
+        /^OpenSuSE/ => ['xorg-x11', 'mkfontdir', 'mkfontscale', 'bdftopcf', 'font-util'],
         default     => 'x11-font-util',
     }
 
@@ -267,12 +257,12 @@
     }
 
     # Most packages needed for a typical slave; see the definitions
-    # above for $ucs2anypkg and $xdevelpkg for the interesting ones.
+    # above for $fontutilpkg and $xdevelpkg for the interesting ones.
     $pkglist = [ "$rpmpkg", "$gpluspluspkg", "$pkgconfigpkg",
                  "$javapkg", 'autoconf', 'automake', 'libtool', "$bisonpkg",
-                 'flex', "$xgettextpkg", 'rsync', "$bdftopcfpkg",
-                 "$intltoolpkg", "$glibdevelpkg", "$pamdevelpkg",
-                 "$expectpkg", "$expatdevelpkg", 'perl', "$libcstaticpkg", 
+                 'flex', "$xgettextpkg", 'rsync', "$intltoolpkg",
+                 "$glibdevelpkg", "$pamdevelpkg", "$expectpkg",
+                 "$expatdevelpkg", 'perl', "$libcstaticpkg", 
                  'ncurses-devel', "$libxsltpkg", "$printprotopkg" ]
 
 }



More information about the lsb-messages mailing list