From 45453595bec6318b84e2dbbf549d14dfdf1a7ce71fac0b4b1b8b7791b365906f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= <ptesarik@suse.com>
Date: Wed, 21 Mar 2012 10:42:35 +0000
Subject: [PATCH] Accepting request 109811 from home:dimstar:gcc47

Fix build with gcc 4.7 - Please work with upstream to resolve it in upstream code base. There is also a chance that a newer version of the package might have this fixed already.

OBS-URL: https://build.opensuse.org/request/show/109811
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=38
---
 kdump-gcc47.patch | 36 ++++++++++++++++++++++++++++++++++++
 kdump.changes     |  5 +++++
 kdump.spec        | 22 +++++++++++++++-------
 3 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 kdump-gcc47.patch

diff --git a/kdump-gcc47.patch b/kdump-gcc47.patch
new file mode 100644
index 0000000..562aa92
--- /dev/null
+++ b/kdump-gcc47.patch
@@ -0,0 +1,36 @@
+Index: kdump-0.8.1/kdumptool/dataprovider.cc
+===================================================================
+--- kdump-0.8.1.orig/kdumptool/dataprovider.cc
++++ kdump-0.8.1/kdumptool/dataprovider.cc
+@@ -20,6 +20,7 @@
+ #include <cstdarg>
+ #include <cerrno>
+ #include <algorithm>
++#include <unistd.h>
+ 
+ #include "dataprovider.h"
+ #include "global.h"
+Index: kdump-0.8.1/kdumptool/debug.cc
+===================================================================
+--- kdump-0.8.1.orig/kdumptool/debug.cc
++++ kdump-0.8.1/kdumptool/debug.cc
+@@ -22,6 +22,7 @@
+ #include <cstring>
+ #include <string>
+ #include <sstream>
++#include <unistd.h>
+ 
+ #include "debug.h"
+ 
+Index: kdump-0.8.1/kdumptool/socket.cc
+===================================================================
+--- kdump-0.8.1.orig/kdumptool/socket.cc
++++ kdump-0.8.1/kdumptool/socket.cc
+@@ -16,6 +16,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  * 02110-1301, USA.
+  */
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
diff --git a/kdump.changes b/kdump.changes
index 7d65c4b..dcef2cd 100644
--- a/kdump.changes
+++ b/kdump.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Mar 17 15:23:22 UTC 2012 - dimstar@opensuse.org
+
+- Add kdump-gcc47.patch: Fix build with gcc 4.7.
+
 -------------------------------------------------------------------
 Sun Jun  5 17:38:54 UTC 2011 - bernhard@bwalle.de
 
diff --git a/kdump.spec b/kdump.spec
index 012d4cf..4f30090 100644
--- a/kdump.spec
+++ b/kdump.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kdump
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Url:            http://freehg.org/u/bwalle/kdump/
 
 Name:           kdump
-License:        GPL-2.0+
 Version:        0.8.1
-Release:        11
-Requires:       curl openssh makedumpfile
+Release:        0
+Requires:       curl
+Requires:       makedumpfile
+Requires:       openssh
 Summary:        Script for kdump
+License:        GPL-2.0+
 Group:          System/Kernel
+BuildRequires:  asciidoc
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  libcurl-devel
+BuildRequires:  libelf0-devel
 BuildRequires:  libesmtp-devel
-BuildRequires:  gcc-c++ libcurl-devel libelf0-devel zlib-devel
-BuildRequires:  asciidoc cmake libxslt
+BuildRequires:  libxslt
+BuildRequires:  zlib-devel
 #!BuildIgnore:  fop
 %if %suse_version > 1100
 BuildRequires:  libssh2-devel
@@ -37,6 +43,7 @@ PreReq:         %insserv_prereq %fillup_prereq mkinitrd
 Source:         %{name}-%{version}.tar.bz2
 Source2:        %{name}-%{version}-rpmlintrc
 Patch0:         %{name}-fix-gcc46.diff
+Patch1:         kdump-gcc47.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2)
 Provides:       kdump-helpers = 0.2.4
@@ -71,6 +78,7 @@ Authors:
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
 
 %build
 export CFLAGS="%optflags"