From ba0367417ea4d115dd23f5cd241bdafd9e812226 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 28 Mar 2016 18:46:13 +0200
Subject: [PATCH] Remove unused nspr dependency

Since change Ie38deadf190db33863c99d4610157349484ac10f ceilometer does
not use spidermonkey which needed libnspr4-dev to be installed. There's
also no other repository using the library.

Thus the requirement can be removed now.

Change-Id: I0dcc581d4c20d6b0da85495cfeb9923cb5bbee93
---
 modules/openstack_project/manifests/jenkins_params.pp     | 2 --
 modules/openstack_project/manifests/thick_slave.pp        | 1 -
 modules/openstack_project/manifests/wheel_mirror_slave.pp | 4 ++--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp
index 23b3bba234..43a88f4a20 100644
--- a/modules/openstack_project/manifests/jenkins_params.pp
+++ b/modules/openstack_project/manifests/jenkins_params.pp
@@ -26,7 +26,6 @@ class openstack_project::jenkins_params {
       $language_fonts_packages = []
       # for keystone ldap auth integration
       $libsasl_dev = 'cyrus-sasl-devel'
-      $nspr_dev_package = 'nspr-devel'
       $sqlite_dev_package = 'sqlite-devel'
       $liberasurecode_dev_package = 'liberasurecode-devel'
       $libevent_dev_package = 'libevent-devel'
@@ -121,7 +120,6 @@ class openstack_project::jenkins_params {
       # for keystone ldap auth integration
       $libsasl_dev = 'libsasl2-dev'
       $mysql_dev_package = 'libmysqlclient-dev'
-      $nspr_dev_package = 'libnspr4-dev'
       $sqlite_dev_package = 'libsqlite3-dev'
       $libvirt_dev_package = 'libvirt-dev'
       $libxml2_package = 'libxml2-utils'
diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp
index 3f0a99d3b6..ddcd2fea88 100644
--- a/modules/openstack_project/manifests/thick_slave.pp
+++ b/modules/openstack_project/manifests/thick_slave.pp
@@ -30,7 +30,6 @@ class openstack_project::thick_slave(
     $::openstack_project::jenkins_params::redis_package, # for tooz unit tests (and others that use redis)
     $::openstack_project::jenkins_params::mongodb_package, # for ceilometer unit tests
     $::openstack_project::jenkins_params::mysql_dev_package,
-    $::openstack_project::jenkins_params::nspr_dev_package, # for spidermonkey, used by ceilometer
     $::openstack_project::jenkins_params::sqlite_dev_package,
     $::openstack_project::jenkins_params::libvirt_dev_package,
     $::openstack_project::jenkins_params::libxml2_package,
diff --git a/modules/openstack_project/manifests/wheel_mirror_slave.pp b/modules/openstack_project/manifests/wheel_mirror_slave.pp
index 8f518147e3..f1bb7d7656 100644
--- a/modules/openstack_project/manifests/wheel_mirror_slave.pp
+++ b/modules/openstack_project/manifests/wheel_mirror_slave.pp
@@ -66,7 +66,7 @@ class openstack_project::wheel_mirror_slave (
                        'libffi-dev', 'libreadline-dev',
                        'libssl-dev', 'libyaml-dev', 'zlib1g-dev',
                        'libldap2-dev', 'libmysqlclient-dev',
-                       'libnspr4-dev', 'libpq-dev', 'libsasl2-dev',
+                       'libpq-dev', 'libsasl2-dev',
                        'libsqlite3-dev', 'libvirt-dev', 'libzmq-dev',
                        'pkg-config', 'swig', 'uuid-dev'])
       }
@@ -77,7 +77,7 @@ class openstack_project::wheel_mirror_slave (
                         'libffi-devel', 'readline-devel',
                         'openssl-devel', 'libyaml-devel', 'zlib-devel',
                         'openldap-devel', 'mariadb-devel',
-                        'nspr-devel', 'postgresql-devel', 'cyrus-sasl-devel',
+                        'postgresql-devel', 'cyrus-sasl-devel',
                         'sqlite-devel', 'libvirt-devel', 'zeromq-devel',
                         'pkgconfig', 'swig', 'uuid-devel'])
     }