[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r407: Add OpenSuSE-isms for buildbot packages.

Jeff Licquia licquia at linuxfoundation.org
Tue Mar 12 02:52:29 UTC 2013


------------------------------------------------------------
revno: 407
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Mon 2013-03-11 22:52:29 -0400
message:
  Add OpenSuSE-isms for buildbot packages.
modified:
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2013-02-11 16:21:01 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2013-03-12 02:52:29 +0000
@@ -16,10 +16,11 @@
     # xts5 is no longer a pure LSB build, needs at least libXi, Xext, Xtst, Xt
     # probably more, the SLES package pulls in a bunch
     $xdevelpkg = $operatingsystem ? {
-        /^Fedora$/ => ['libXi-devel', 'libXext-devel', 'libXtst-devel', 'libXt-devel', 'libXdmcp-devel'],
-        /^CentOS$/ => ['libXi-devel', 'libXext-devel', 'libXtst-devel', 'libXt-devel', 'libXdmcp-devel'],
-        /^SLES/ => 'xorg-x11-devel',
-        default => 'libxorg-x11-devel',
+        /^Fedora$/  => ['libXi-devel', 'libXext-devel', 'libXtst-devel', 'libXt-devel', 'libXdmcp-devel'],
+        /^CentOS$/  => ['libXi-devel', 'libXext-devel', 'libXtst-devel', 'libXt-devel', 'libXdmcp-devel'],
+        /^SLES/     => 'xorg-x11-devel',
+        /^OpenSuSE/ => 'xorg-x11-devel',
+        default     => 'libxorg-x11-devel',
     }
 
     # this one for xts5 and lsb-xvfb
@@ -34,10 +35,11 @@
     # NOTE: on Red Hat-based systems, this is the same as $bdftopcfpkg,
     # so don't include it 
     $ucs2anypkg = $operatingsystem ? {
-        /^Fedora$/ => 'xorg-x11-font-utils',
-        /^CentOS$/ => 'xorg-x11-font-utils',
-        /^SLES/ => 'xorg-x11-fonts-devel',
-        default => 'x11-font-util',
+        /^Fedora$/  => 'xorg-x11-font-utils',
+        /^CentOS$/  => 'xorg-x11-font-utils',
+        /^SLES/     => 'xorg-x11-fonts-devel',
+        /^OpenSuSE/ => 'font-util',
+        default     => 'x11-font-util',
     }
 
     $lsbpkg = $operatingsystem ? {
@@ -66,17 +68,20 @@
         /^SLES-ia64$/   => 'jre',
         /^CentOS/       => 'java-1.6.0-openjdk',
         /^Fedora/       => 'java-1.7.0-openjdk',
+        /^OpenSuSE/     => 'java-1_7_0-openjdk',
         default         => 'openjdk',
     }
 
     $pkgconfigpkg = $operatingsystem ? {
-        /^SLES/ => 'pkg-config',
-        default => 'pkgconfig',
+        /^SLES/     => 'pkg-config',
+        /^OpenSuSE/ => 'pkg-config',
+        default     => 'pkgconfig',
     }
 
     $xgettextpkg = $operatingsystem ? {
-        /^SLES/ => 'gettext-tools',
-        default => 'gettext',
+        /^SLES/     => 'gettext-tools',
+        /^OpenSuSE/ => 'gettext-tools',
+        default     => 'gettext',
     }
 
     # for appbat
@@ -99,10 +104,11 @@
 
     # expat - needed for old builds of libbat/appbat
     $expatdevelpkg = $operatingsystem ? {
-        /^SLES/   => 'libexpat-devel',
-        /^CentOS/ => 'expat-devel',
-        /^Fedora/ => 'expat-devel',
-        default   => 'libexpat-dev',
+        /^SLES/     => 'libexpat-devel',
+        /^OpenSuSE/ => 'libexpat-devel',
+        /^CentOS/   => 'expat-devel',
+        /^Fedora/   => 'expat-devel',
+        default     => 'libexpat-dev',
     }
 
     # runtime-test for 4.0 still uses expect
@@ -121,10 +127,11 @@
     
     # need libc.a to build a chroot test in runtime-test
     $libcstaticpkg = $operatingsystem ? {
-        /^SLES/   => 'glibc-devel',
-        /^CentOS/ => 'glibc-static',
-        /^Fedora/ => 'glibc-static',
-        default   => 'glibc-static-devel',
+        /^SLES/     => 'glibc-devel',
+        /^OpenSuSE/ => 'glibc-devel-static',
+        /^CentOS/   => 'glibc-static',
+        /^Fedora/   => 'glibc-static',
+        default     => 'glibc-static-devel',
     }
 
     # Apparently, libbat needs the printproto stuff to be
@@ -136,6 +143,12 @@
         default   => 'libXp-devel',
     }
 
+    # libxslt
+    $libxsltpkg = $operatingsystem ? {
+        /^OpenSuSE/ => 'libxslt1',
+        default     => 'libxslt',
+    }
+
     # devchk needs
     $qt4pkg = $operatingsystem ? {
         /^SLES/   => 'libqt4-devel',
@@ -260,6 +273,6 @@
                  'flex', "$xgettextpkg", 'rsync', "$bdftopcfpkg",
                  "$intltoolpkg", "$glibdevelpkg", "$pamdevelpkg",
                  "$expectpkg", "$expatdevelpkg", 'perl', "$libcstaticpkg", 
-                 'ncurses-devel', 'libxslt', "$printprotopkg" ]
+                 'ncurses-devel', "$libxsltpkg", "$printprotopkg" ]
 
 }



More information about the lsb-messages mailing list