totem: Remove unnecessary NSS headers

Also fix corosync.spec.in to depend on libknet.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>

diff --git a/corosync.spec.in b/corosync.spec.in
index 49d7b7e884a0183d356272896396aa5ac999d9a0..732dac544ba98ce46123d161fe48d307274de76d 100644 (file)
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -44,6 +44,7 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89
 BuildRequires: groff
 BuildRequires: libqb-devel
 BuildRequires: nss-devel
+BuildRequires: libknet1-devel
 BuildRequires: zlib-devel
 %if %{with runautogen}
 BuildRequires: autoconf automake libtool

diff --git a/exec/totemknet.c b/exec/totemknet.c
index a31d513de9d964344eab017a530a567a15736bd3..ae9247a197ef16c2826c98154f882b171a9ecbf1 100644 (file)
--- a/exec/totemknet.c
+++ b/exec/totemknet.c
@@ -70,11 +70,6 @@
 
 #include "util.h"
 
-#include <nss.h>
-#include <pk11pub.h>
-#include <pkcs11.h>
-#include <prerror.h>
-
 #include <libknet.h>
 #include <corosync/totem/totemstats.h>
 

diff --git a/exec/totemudp.c b/exec/totemudp.c
index e3009f188530b233c44440dc88cfced2c721dbb6..2f986da304a15e5ff36d70ad87e68408ffa02831 100644 (file)
--- a/exec/totemudp.c
+++ b/exec/totemudp.c
@@ -69,11 +69,6 @@
 
 #include "util.h"
 
-#include <nss.h>
-#include <pk11pub.h>
-#include <pkcs11.h>
-#include <prerror.h>
-
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif

diff --git a/exec/totemudpu.c b/exec/totemudpu.c
index 4b1a488788b7edc9dcc111f94f859ed925c9c465..bddb8a9098c44a90bf2b8f56f4c1ec64609a3c3b 100644 (file)
--- a/exec/totemudpu.c
+++ b/exec/totemudpu.c
@@ -70,11 +70,6 @@
 
 #include "util.h"
 
-#include <nss.h>
-#include <pk11pub.h>
-#include <pkcs11.h>
-#include <prerror.h>
-
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif