From 8347f104ebd073619214b1c570235d1637975f18254f4cf9b68cd590a91fa725 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 23 Aug 2021 23:52:54 +0000
Subject: [PATCH] - Update to release 1.22

OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=77
---
 _service                           | 15 ---------------
 dwarves-1.21+git177.1ef87b2.tar.xz |  3 ---
 dwarves-1.22.tar.sign              |  7 +++++++
 dwarves-1.22.tar.xz                |  3 +++
 dwarves.changes                    |  8 ++++++++
 dwarves.spec                       | 17 ++++++++---------
 6 files changed, 26 insertions(+), 27 deletions(-)
 delete mode 100644 _service
 delete mode 100644 dwarves-1.21+git177.1ef87b2.tar.xz
 create mode 100644 dwarves-1.22.tar.sign
 create mode 100644 dwarves-1.22.tar.xz

diff --git a/_service b/_service
deleted file mode 100644
index 20140ce..0000000
--- a/_service
+++ /dev/null
@@ -1,15 +0,0 @@
-<services>
-  <service name="tar_scm" mode="disabled">
-    <param name="scm">git</param>
-    <param name="url">git://git.kernel.org/pub/scm/devel/pahole/pahole</param>
-    <param name="revision">master</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
-    <param name="filename">dwarves</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service name="set_version" mode="disabled" />
-</services>
diff --git a/dwarves-1.21+git177.1ef87b2.tar.xz b/dwarves-1.21+git177.1ef87b2.tar.xz
deleted file mode 100644
index 5c7dc4e..0000000
--- a/dwarves-1.21+git177.1ef87b2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6ad2458d9ac5d60ab84fc150481e0f1331a6b90b917719542e47ec02738ef3f
-size 910360
diff --git a/dwarves-1.22.tar.sign b/dwarves-1.22.tar.sign
new file mode 100644
index 0000000..e2fb387
--- /dev/null
+++ b/dwarves-1.22.tar.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYIAB0WIQR2GiIUctdOfX2qHhGyPKLppCJ+JwUCYSOfhAAKCRCyPKLppCJ+
+J+C9AQCMkLbx+eqgvJA8ZFGVNN0i537BrDI2zuaEvYnXmcCGdQD/ccp9+okyQ1d5
+/LwFxBO0hi4dkUobR8x4fj07LZpAQAE=
+=1kMT
+-----END PGP SIGNATURE-----
diff --git a/dwarves-1.22.tar.xz b/dwarves-1.22.tar.xz
new file mode 100644
index 0000000..97298ba
--- /dev/null
+++ b/dwarves-1.22.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bcba48be39da2868142440dc2ee7f1d7b99ffec8095e3a1afb280dc1a7c63df
+size 922016
diff --git a/dwarves.changes b/dwarves.changes
index 77cba66..810a387 100644
--- a/dwarves.changes
+++ b/dwarves.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug 23 23:31:59 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.22
+  * Ability to encode BTF to a separate file
+  * Multithreaded DWARF loading
+  * Details at https://marc.info/?l=dwarves&m=162975403628056&w=2
+
 -------------------------------------------------------------------
 Wed Aug 18 09:00:01 UTC 2021 - Michal Suchanek <msuchanek@suse.com>
 
diff --git a/dwarves.spec b/dwarves.spec
index a627fd5..e2eaf45 100644
--- a/dwarves.spec
+++ b/dwarves.spec
@@ -19,12 +19,12 @@
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300
 %define have_libbpf 1
 %endif
-%if ( 0%{?sle_version} && 0%{?sle_version} <= 150300 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
-%define have_libebl-plugins 1
+%if (0%{?sle_version} && 0%{?sle_version} <= 150300) || (0%{?suse_version} && 0%{?suse_version} < 1500)
+%define have_libebl_plugins 1
 %endif
 
 Name:           dwarves
-Version:        1.21+git177.1ef87b2
+Version:        1.22
 Release:        0
 Summary:        DWARF utilities
 License:        GPL-2.0-only
@@ -32,9 +32,8 @@ Group:          Development/Tools/Debuggers
 URL:            https://acmel.wordpress.com/
 #Git-Clone:	git://git.kernel.org/pub/scm/devel/pahole/pahole
 #Git-Web:	http://git.kernel.org/cgit/devel/pahole/pahole.git
-Source:         %{name}-%{version}.tar.xz
-#Source:         https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz
-#Source2:        https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign
+Source:         https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz
+Source2:        https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign
 Source9:        baselibs.conf
 BuildRequires:  cmake
 BuildRequires:  libdw-devel >= 0.171
@@ -96,17 +95,17 @@ This package contains the development files for libdwarves, a library
 for processing DWARF, a debugging data format for ELF files.
 
 %prep
-%autosetup -p1
+%autosetup
 
 %build
 sv="$PWD/lib.v"
 ver=$(echo %version | cut -d+ -f1)
 echo "DWARVES_$ver{ global: *; };" >"$sv"
-%cmake -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--version-script=$sv" \
+%cmake \
 %if 0%{?have_libbpf}
 	-DLIBBPF_EMBEDDED=OFF \
 %endif
-	%nil
+	-DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--version-script=$sv"
 %cmake_build
 
 %install