From 78a2aa743d3363d52b8b5ca33f1b6e2ad3ea1ed2 Mon Sep 17 00:00:00 2001
From: Augusto Caringi <acaringi@redhat.com>
Date: Tue, 14 Apr 2020 16:08:09 -0300
Subject: [PATCH] Rebase to new release version: 0.10.0

Signed-off-by: Augusto Caringi <acaringi@redhat.com>
---
 .gitignore                                    |  1 +
 ...-Add-missing-string-include-to-btf.h.patch | 37 -------------------
 bpftrace.spec                                 | 13 +++----
 sources                                       |  2 +-
 4 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 0001-Add-missing-string-include-to-btf.h.patch

diff --git a/.gitignore b/.gitignore
index 4e59316..e33fd3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /bpftrace-0.9.2.tar.gz
 /bpftrace-0.9.3.tar.gz
 /bpftrace-0.9.4.tar.gz
+/bpftrace-0.10.0.tar.gz
diff --git a/0001-Add-missing-string-include-to-btf.h.patch b/0001-Add-missing-string-include-to-btf.h.patch
deleted file mode 100644
index b10988a..0000000
--- a/0001-Add-missing-string-include-to-btf.h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 145041ec75eae1e58fcd3f784964303fb75c16d5 Mon Sep 17 00:00:00 2001
-From: Augusto Caringi <acaringi@redhat.com>
-Date: Wed, 5 Feb 2020 15:24:21 +0100
-Subject: [PATCH] Add missing <string> include to btf.h
-
-The missing include was causing building problems with gcc 10.0.1:
-
-In file included from
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.cpp:1:
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:26:8: error: 'string' in
-namespace 'std' does not name a type
-   26 |   std::string c_def(std::unordered_set<std::string>& set);
-      |        ^~~~~~
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:7:1: note: 'std::string'
-is defined in header '<string>'; did you forget to '#include <string>'?
-    6 | #include <unordered_set>
-  +++ |+#include <string>
-    7 |
----
- src/btf.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/btf.h b/src/btf.h
-index 05b56ff..8856bfc 100644
---- a/src/btf.h
-+++ b/src/btf.h
-@@ -1,6 +1,7 @@
- #pragma once
- 
- #include <linux/types.h>
-+#include <string>
- #include <unistd.h>
- #include <unordered_set>
- 
--- 
-2.21.1
-
diff --git a/bpftrace.spec b/bpftrace.spec
index 9c342c5..8b86be0 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,16 +1,15 @@
 Name:           bpftrace
-Version:        0.9.4
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        High-level tracing language for Linux eBPF
 License:        ASL 2.0
 
 URL:            https://github.com/iovisor/bpftrace
-Patch0:         0001-Add-missing-string-include-to-btf.h.patch
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 # Arches will be included as upstream support is added and dependencies are
 # satisfied in the respective arches
-ExclusiveArch:  x86_64 %{power64} aarch64 s390x
+ExclusiveArch:  x86_64 %{power64} aarch64
 
 BuildRequires:  gcc-c++
 BuildRequires:  bison
@@ -56,10 +55,6 @@ and predecessor tracers such as DTrace and SystemTap
 find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
   sed -i -e '1s=^#!/usr/bin/env %{name}\([0-9.]\+\)\?$=#!%{_bindir}/%{name}=' {} \;
 
-# Move man pages to the right location
-mkdir -p %{buildroot}%{_mandir}
-mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
-
 
 %files
 %doc README.md CONTRIBUTING-TOOLS.md
@@ -75,6 +70,10 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
 
 
 %changelog
+* Tue Apr 14 2020 Augusto Caringi <acaringi@redhat.com> - 0.10.0-1
+- Rebased to version 0.10.0
+- Dropped support for s390x temporaly due to build error
+
 * Thu Feb 06 2020 Augusto Caringi <acaringi@redhat.com> - 0.9.4-1
 - Rebased to version 0.9.4
 
diff --git a/sources b/sources
index 0db1bc7..ad2f466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.9.4.tar.gz) = d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
+SHA512 (bpftrace-0.10.0.tar.gz) = da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9