rpms/NetworkManager
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Work around nss error

Browse Source
This commit is contained in:
Dan Williams 2011-11-10 12:41:41 -06:00
parent 04ba8e9140
commit ba531f599f
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NetworkManager.spec
View File

@ -28,6 +28,7 @@ Patch2: explain-dns1-dns2.patch
Patch3: nm-applet-no-notifications.patch Patch3: nm-applet-no-notifications.patch
Patch4: nm-polkit-permissive.patch Patch4: nm-polkit-permissive.patch
Patch5: nm-applet-wifi-dialog-ui-fixes.patch Patch5: nm-applet-wifi-dialog-ui-fixes.patch
Patch6: nss-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig Requires(post): chkconfig
@ -190,6 +191,7 @@ tar -xjf %{SOURCE1}
%patch3 -p1 -b .no-notifications %patch3 -p1 -b .no-notifications
%patch4 -p1 -b .polkit-permissive %patch4 -p1 -b .polkit-permissive
%patch5 -p1 -b .applet-wifi-ui %patch5 -p1 -b .applet-wifi-ui
%patch6 -p1 -b .nss-error
%build %build

15
nss-error.patch Normal file
View File

@ -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>