[NetworkManager] Work around nss error
Daniel Williams
dcbw at fedoraproject.org
Thu Nov 10 18:41:59 UTC 2011
commit ba531f599f6deb20599edf36eed0a9ce3dd410ee
Author: Dan Williams <dcbw at redhat.com>
Date: Thu Nov 10 12:41:41 2011 -0600
Work around nss error
NetworkManager.spec | 2 ++
nss-error.patch | 15 +++++++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index b61c710..74c3a3f 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -28,6 +28,7 @@ Patch2: explain-dns1-dns2.patch
Patch3: nm-applet-no-notifications.patch
Patch4: nm-polkit-permissive.patch
Patch5: nm-applet-wifi-dialog-ui-fixes.patch
+Patch6: nss-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
@@ -190,6 +191,7 @@ tar -xjf %{SOURCE1}
%patch3 -p1 -b .no-notifications
%patch4 -p1 -b .polkit-permissive
%patch5 -p1 -b .applet-wifi-ui
+%patch6 -p1 -b .nss-error
%build
diff --git a/nss-error.patch b/nss-error.patch
new file mode 100644
index 0000000..0a63148
--- /dev/null
+++ b/nss-error.patch
@@ -0,0 +1,15 @@
+diff -up NetworkManager-0.9.2.0/libnm-util/crypto_nss.c.foo NetworkManager-0.9.2.0/libnm-util/crypto_nss.c
+--- NetworkManager-0.9.2.0/libnm-util/crypto_nss.c.foo 2011-11-10 12:40:14.365009479 -0600
++++ NetworkManager-0.9.2.0/libnm-util/crypto_nss.c 2011-11-10 12:40:48.787579140 -0600
+@@ -26,6 +26,11 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+
++/* Work around NSS error:
++ * /usr/include/nss3/pkcs11n.h:365:26: error: "__GNUC_MINOR" is not defined [-Werror=undef]
++ */
++#define __GNUC_MINOR __GNUC_MINOR__
++
+ #include <prinit.h>
+ #include <nss.h>
+ #include <pk11pub.h>
More information about the scm-commits
mailing list