Replace own patch by upstream one

OBS-URL: https://build.opensuse.org/package/show/security/libseccomp?expand=0&rev=28

0001-build-resolve-build-failure-due-to-lacking-includes.patch

@@ -1,33 +0,0 @@
-From 0dad79efa5b4538d6e5ee19cacd8909a0d6e23de Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 29 Mar 2015 01:52:31 +0100
-Subject: [PATCH] build: resolve build failure due to lacking includes
-Upstream: sent
-
-If /usr/include/linux/elf-em.h is sufficiently old and only
-/usr/include/elf.h (from glibc) has EM_ARM, the build fails
-in tools/. This is because elf.h is not included :(
-
-In file included from scmp_bpf_disasm.c:30:0:
-scmp_bpf_disasm.c: In function 'main':
-scmp_bpf_disasm.c:322:12: error: 'EM_ARM' undeclared (first use in this function)
-     arch = AUDIT_ARCH_ARM;
----
- tools/util.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/util.h b/tools/util.h
-index 13ef59f..09fe507 100644
---- a/tools/util.h
-+++ b/tools/util.h
-@@ -24,6 +24,7 @@
- 
- #include <inttypes.h>
- #include <linux/audit.h>
-+#include <elf.h>
- 
- #ifndef __AUDIT_ARCH_CONVENTION_MIPS64_N32
- #define __AUDIT_ARCH_CONVENTION_MIPS64_N32	0x20000000
--- 
-2.1.4
-

0001-tools-add-the-missing-elf.h-header-file.patch

@@ -0,0 +1,25 @@
+From 7a7a83a24491f636d422e951f9e0547caaa68967 Mon Sep 17 00:00:00 2001
+From: Paul Moore <pmoore@redhat.com>
+Date: Fri, 13 Feb 2015 11:57:43 -0500
+Subject: [PATCH] tools: add the missing elf.h header file
+
+Signed-off-by: Paul Moore <pmoore@redhat.com>
+---
+ tools/util.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/util.h b/tools/util.h
+index 13ef59f..261320f 100644
+--- a/tools/util.h
++++ b/tools/util.h
+@@ -22,6 +22,7 @@
+ #ifndef _UTIL_H
+ #define _UTIL_H
+ 
++#include <elf.h>
+ #include <inttypes.h>
+ #include <linux/audit.h>
+ 
+-- 
+2.1.4
+

libseccomp.changes

@@ -8,7 +8,7 @@ Sun Mar 29 00:28:59 UTC 2015 - jengelh@inai.de
 * Added Python bindings
 - Remove 0001-build-use-autotools-as-build-system.patch
   (merged). Add no-static.diff.
-  Add 0001-build-resolve-build-failure-due-to-lacking-includes.patch
+  Add 0001-tools-add-the-missing-elf.h-header-file.patch
 
 -------------------------------------------------------------------
 Sat Jul 12 11:26:10 UTC 2014 - meissner@suse.com

libseccomp.spec

@@ -29,7 +29,7 @@ Url:            http://github.com/seccomp
 Source:         https://github.com/seccomp/libseccomp/releases/download/v%version/%name-%version.tar.gz
 Source2:        https://github.com/seccomp/libseccomp/releases/download/v%version/%name-%version.tar.gz.SHA256SUM.asc
 Patch1:         no-static.diff
-Patch2:         0001-build-resolve-build-failure-due-to-lacking-includes.patch
+Patch2:         0001-tools-add-the-missing-elf.h-header-file.patch
 Patch3:         libseccomp-s390x-support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf