[jhbuild/wip/ptomato/macos: 6/12] modules: e-d-s always needs nss and nspr

[Philip Chimento <pchimento src gnome org>]

commit f05e2f7099eacfb78d95d4711c2d39f77141d2ee
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Nov 11 12:05:48 2016 -0800

    modules: e-d-s always needs nss and nspr
    
    They used to be optional, but since 3.4 they have been required
    unconditionally.

 modulesets/gnome-suites-core-3.10.modules      |    5 ++---
 modulesets/gnome-suites-core-3.12.modules      |    5 ++---
 modulesets/gnome-suites-core-3.14.modules      |    5 ++---
 modulesets/gnome-suites-core-3.16.modules      |    5 ++---
 modulesets/gnome-suites-core-3.18.modules      |    5 ++---
 modulesets/gnome-suites-core-3.20.modules      |    5 ++---
 modulesets/gnome-suites-core-3.4.modules       |    4 +---
 modulesets/gnome-suites-core-3.6.modules       |    4 +---
 modulesets/gnome-suites-core-3.8.modules       |    5 ++---
 modulesets/gnome-suites-core-deps-3.22.modules |    5 ++---
 modulesets/gnome-suites-core-deps-3.24.modules |    5 ++---
 11 files changed, 20 insertions(+), 33 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.10.modules b/modulesets/gnome-suites-core-3.10.modules
index 6bc729e..57136be 100644
--- a/modulesets/gnome-suites-core-3.10.modules
+++ b/modulesets/gnome-suites-core-3.10.modules
@@ -81,10 +81,9 @@
       <dep package="vala"/>
       <dep package="libdb"/>
       <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gnome-bluetooth">
diff --git a/modulesets/gnome-suites-core-3.12.modules b/modulesets/gnome-suites-core-3.12.modules
index 9317e82..fdb9136 100644
--- a/modulesets/gnome-suites-core-3.12.modules
+++ b/modulesets/gnome-suites-core-3.12.modules
@@ -85,10 +85,9 @@
       <dep package="vala"/>
       <dep package="libdb"/>
       <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gnome-bluetooth">
diff --git a/modulesets/gnome-suites-core-3.14.modules b/modulesets/gnome-suites-core-3.14.modules
index c4ce8d9..4082b3e 100644
--- a/modulesets/gnome-suites-core-3.14.modules
+++ b/modulesets/gnome-suites-core-3.14.modules
@@ -88,10 +88,9 @@
       <dep package="vala"/>
       <dep package="libdb"/>
       <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gnome-bluetooth">
diff --git a/modulesets/gnome-suites-core-3.16.modules b/modulesets/gnome-suites-core-3.16.modules
index 09a5b33..db1034b 100644
--- a/modulesets/gnome-suites-core-3.16.modules
+++ b/modulesets/gnome-suites-core-3.16.modules
@@ -86,10 +86,9 @@
       <dep package="vala"/>
       <dep package="libdb"/>
       <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gnome-bluetooth">
diff --git a/modulesets/gnome-suites-core-3.18.modules b/modulesets/gnome-suites-core-3.18.modules
index a31fd1d..268df60 100644
--- a/modulesets/gnome-suites-core-3.18.modules
+++ b/modulesets/gnome-suites-core-3.18.modules
@@ -86,10 +86,9 @@
       <dep package="vala"/>
       <dep package="libdb"/>
       <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gnome-bluetooth">
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index 4a9e188..0e85402 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -106,10 +106,9 @@
       <dep package="vala"/>
       <dep package="libdb"/>
       <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gdm" autogenargs="--with-systemdsystemunitdir=no --with-log-dir=${prefix}/var/log/gdm">
diff --git a/modulesets/gnome-suites-core-3.4.modules b/modulesets/gnome-suites-core-3.4.modules
index 6ccd678..765dbb5 100644
--- a/modulesets/gnome-suites-core-3.4.modules
+++ b/modulesets/gnome-suites-core-3.4.modules
@@ -78,11 +78,9 @@
       <dep package="gnome-online-accounts"/>
       <dep package="liboauth"/>
       <dep package="vala"/>
-    </dependencies>
-    <suggests>
       <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
     <after>
       <dep package="libgnome-keyring"/>
     </after>
diff --git a/modulesets/gnome-suites-core-3.6.modules b/modulesets/gnome-suites-core-3.6.modules
index 599713e..7fae33f 100644
--- a/modulesets/gnome-suites-core-3.6.modules
+++ b/modulesets/gnome-suites-core-3.6.modules
@@ -81,11 +81,9 @@
       <dep package="liboauth"/>
       <dep package="vala"/>
       <dep package="libdb"/>
-    </dependencies>
-    <suggests>
       <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
     <after>
       <dep package="libgnome-keyring"/>
     </after>
diff --git a/modulesets/gnome-suites-core-3.8.modules b/modulesets/gnome-suites-core-3.8.modules
index 4b379c9..9400555 100644
--- a/modulesets/gnome-suites-core-3.8.modules
+++ b/modulesets/gnome-suites-core-3.8.modules
@@ -78,10 +78,9 @@
       <dep package="vala"/>
       <dep package="libdb"/>
       <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gnome-bluetooth">
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index 6c20923..71c49a1 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -301,10 +301,9 @@
       <dep package="libdb"/>
       <dep package="libsecret"/>
       <dep package="WebKit"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="folks"
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index bd89466..579806d 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -299,10 +299,9 @@
       <dep package="libsecret"/>
       <dep package="WebKit"/>
       <dep package="openldap"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </cmake>
 
   <autotools id="folks"