From d4cf9ee47e0b20e91f2e0a0a7db0c7a106527e02 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Apr 15 2011 00:57:50 +0000 Subject: Fix getpid() again for real --- diff --git a/.gitignore b/.gitignore index 2a7395f..eb11d55 100644 --- a/.gitignore +++ b/.gitignore @@ -227,3 +227,4 @@ network-manager-applet-0.8.1.tar.bz2 /network-manager-applet-0.8.3.997.tar.bz2 /NetworkManager-0.8.3.998.tar.bz2 /network-manager-applet-0.8.3.998.tar.bz2 +/network-manager-applet-0.8.3.999.git20110414.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index 94d9dc7..0d0d5c1 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -26,7 +26,6 @@ Source2: NetworkManager.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch Patch3: nm-applet-no-notifications.patch -Patch10: sys-types-for-getpid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -154,7 +153,6 @@ tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 %patch3 -p1 -b .no-notifications -%patch10 -p1 -b .getpid %build diff --git a/sources b/sources index 26549f2..238df4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ c3749c67450660144209cf6fee43dbac NetworkManager-0.8.3.999.git20110414.tar.bz2 -5a2127dd94a1441d0ca808fe04cdc84d network-manager-applet-0.8.3.999.git20110414.tar.bz2 +c9e887b34e65932d50c98e5c08414ead network-manager-applet-0.8.3.999.git20110414.tar.bz2 diff --git a/sys-types-for-getpid.patch b/sys-types-for-getpid.patch deleted file mode 100644 index fcb4d99..0000000 --- a/sys-types-for-getpid.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up NetworkManager-0.8.3.999/src/main.c.foo NetworkManager-0.8.3.999/src/main.c ---- NetworkManager-0.8.3.999/src/main.c.foo 2011-04-14 19:40:53.513262108 -0500 -+++ NetworkManager-0.8.3.999/src/main.c 2011-04-14 19:41:04.977262052 -0500 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "NetworkManager.h" - #include "NetworkManagerUtils.h"