From 90decd2ae61f5ea167e46021ae82030668b34e25 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@kernel.org>
Date: Oct 07 2021 08:03:44 +0000
Subject: New release: v1.22


Resolves: rhbz#2010414

---

diff --git a/.gitignore b/.gitignore
index 6a20200..5d65fc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /dwarves-1.20.tar.xz
 /0001-btf-Remove-ftrace-filter.patch
 /dwarves-1.21.tar.xz
+/dwarves-1.22.tar.xz
diff --git a/dwarves.spec b/dwarves.spec
index 9806f29..6c5de6c 100644
--- a/dwarves.spec
+++ b/dwarves.spec
@@ -2,14 +2,13 @@
 %define libver 1
 
 Name: dwarves
-Version: 1.21
-Release: 2%{?dist}
+Version: 1.22
+Release: 1%{?dist}
 License: GPLv2
 Summary: Debugging Information Manipulation Tools (pahole & friends)
 URL: http://acmel.wordpress.com
 Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.xz
 Requires: %{libname}%{libver} = %{version}-%{release}
-Patch1: 0001-btf-Remove-ftrace-filter.patch
 BuildRequires: gcc
 BuildRequires: cmake >= 2.8.12
 BuildRequires: zlib-devel
@@ -66,7 +65,6 @@ Debugging information processing library development files.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=Release .
@@ -81,7 +79,7 @@ rm -Rf %{buildroot}
 %files
 %doc README.ctracer
 %doc README.btf
-%doc changes-v1.21
+%doc changes-v1.22
 %doc NEWS
 %{_bindir}/btfdiff
 %{_bindir}/codiff
@@ -116,7 +114,6 @@ rm -Rf %{buildroot}
 %doc MANIFEST README
 %{_includedir}/dwarves/btf_encoder.h
 %{_includedir}/dwarves/config.h
-%{_includedir}/dwarves/ctf_encoder.h
 %{_includedir}/dwarves/ctf.h
 %{_includedir}/dwarves/dutil.h
 %{_includedir}/dwarves/dwarves.h
@@ -126,16 +123,34 @@ rm -Rf %{buildroot}
 %{_includedir}/dwarves/elf_symtab.h
 %{_includedir}/dwarves/gobuffer.h
 %{_includedir}/dwarves/hash.h
-%{_includedir}/dwarves/libbtf.h
 %{_includedir}/dwarves/libctf.h
 %{_includedir}/dwarves/list.h
 %{_includedir}/dwarves/rbtree.h
-%{_includedir}/dwarves/pahole_strings.h
 %{_libdir}/%{libname}.so
 %{_libdir}/%{libname}_emit.so
 %{_libdir}/%{libname}_reorganize.so
 
 %changelog
+* Wed Oct 6 2021 Jiri Olsa <jolsa@redhat.com> - 1.22-1
+- New release: v1.22
+- Resolves: rhbz#2010414
+- Introduce -j/--jobs option to specify the number of threads to use.
+- Multithreaded DWARF loading, requires elfutils >= 0.178.
+- Preparatory work for multithreaded BTF encoding, the focus for 1.23.
+- Allow encoding BTF to a separate file.
+- Show all different types with the same name, not just the first one found.
+- Stop assuming that reading from stdin means pretty, add --prettify.
+- Improve type resolution for the --header command line option.
+- Do not consider the ftrace filter when encoding BTF for kernel functions.
+- Lock calls to non-thread safe elfutils' dwarf_decl_file() and dwarf_decl_line().
+- Change hash table size to one that performs better with current typical vmlinux files.
+- Allow tweaking the hash table size from the command line.
+- Add --kabi_prefix to avoid deduplication woes when using _RH_KABI_REPLACE().
+- Add --with_flexible_array to show just types with flexible arrays.
+- Support btfdiff with a detached BTF file.
+- Introduce sorted type output (--sort).
+- Disable incomplete CTF encoder.
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.21-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/sources b/sources
index 4896e81..0d5174c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (0001-btf-Remove-ftrace-filter.patch) = e20a26ba3fef9eabc421e50b1eeb0d06f973d98a8e029a224cfebfa7f9e3031105544ed1dd917b0699f7ebd33085d2492b4f80b3cb725de3ba56a2903a825183
-SHA512 (dwarves-1.21.tar.xz) = 69f510025f5790a004c356546f7d92996ad84c4ff1636876b48f1c7d81bf66c83da70f11a1912d65b46f81bea79418782021396a018e74baae5cad9221af14e1
+SHA512 (dwarves-1.22.tar.xz) = d45b19505cd59eb2cbb42304ab599661355a4085262cb202757822ec1c05476c851dea85e922f9421efb8a978ab475a6a6545757c6ab080f13ac77c5f7186606