From 6a5c490aaa4ad2713fc7fa8bd4f6aaf3359ca6bb16b20f0fd96cc1b835b8da3d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 16 Dec 2019 15:54:51 +0000
Subject: [PATCH] - Update to release 1.16

OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=33
---
 _service                  | 13 -------------
 dwarves-1.16.tar.sign     |  7 +++++++
 dwarves-1.16.tar.xz       |  3 +++
 dwarves.changes           |  6 ++++++
 dwarves.spec              | 16 ++++++----------
 libbpf-0.0.3+git30.tar.xz |  3 ---
 pahole-1.15.tar.gz        |  3 ---
 7 files changed, 22 insertions(+), 29 deletions(-)
 delete mode 100644 _service
 create mode 100644 dwarves-1.16.tar.sign
 create mode 100644 dwarves-1.16.tar.xz
 delete mode 100644 libbpf-0.0.3+git30.tar.xz
 delete mode 100644 pahole-1.15.tar.gz

diff --git a/_service b/_service
deleted file mode 100644
index e5d2d99..0000000
--- a/_service
+++ /dev/null
@@ -1,13 +0,0 @@
-<services>
-	<service name="tar_scm" mode="disabled">
-		<param name="scm">git</param>
-		<param name="url">https://github.com/libbpf/libbpf</param>
-		<param name="revision">52ec16bce80451130db50d0ad3a1c7135c12195c</param>
-		<param name="versionrewrite-pattern">v(.*)</param>
-		<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@</param>
-	</service>
-	<service name="recompress" mode="disabled">
-		<param name="file">*.tar</param>
-		<param name="compression">xz</param>
-	</service>
-</services>
diff --git a/dwarves-1.16.tar.sign b/dwarves-1.16.tar.sign
new file mode 100644
index 0000000..c8ed36b
--- /dev/null
+++ b/dwarves-1.16.tar.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYIAB0WIQR2GiIUctdOfX2qHhGyPKLppCJ+JwUCXfeZggAKCRCyPKLppCJ+
+J+qRAP4hsYBLF8AiuBTDTCz+S6VtxKUwlF4Co/1amF6058K+wQEAic1NPigCkOAt
+/oEIMwZTxcXTLSfndynDejpGmZ/eKwc=
+=fzau
+-----END PGP SIGNATURE-----
diff --git a/dwarves-1.16.tar.xz b/dwarves-1.16.tar.xz
new file mode 100644
index 0000000..1ecba18
--- /dev/null
+++ b/dwarves-1.16.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f900628ea12fc033423400eb6fb660ac5a8522be430ec8f3e36abee6440e43a1
+size 273060
diff --git a/dwarves.changes b/dwarves.changes
index 2c5ae15..63bd8c1 100644
--- a/dwarves.changes
+++ b/dwarves.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 16 15:50:02 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.16
+  * btf_loader: Add support for BTF_KIND_FUNC
+
 -------------------------------------------------------------------
 Thu Jun 27 11:22:47 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/dwarves.spec b/dwarves.spec
index d85a8d6..539aa2c 100644
--- a/dwarves.spec
+++ b/dwarves.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dwarves
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,16 @@
 
 
 Name:           dwarves
-Version:        1.15
+Version:        1.16
 Release:        0
 Summary:        DWARF utilities
 License:        GPL-2.0-only
 Group:          Development/Tools/Debuggers
-Url:            http://acmel.wordpress.com/
+URL:            http://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:         https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-%version.tar.gz
-Source2:        libbpf-0.0.3+git30.tar.xz
+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.142
@@ -80,8 +80,7 @@ This package contains the development files for libdwarves, a library
 for processing DWARF, a debugging data format for ELF files.
 
 %prep
-%setup -qn pahole-%version -a2
-mv libbpf-0*/* lib/bpf/
+%setup -cq
 
 %build
 %cmake
@@ -94,17 +93,14 @@ make %{?_smp_mflags}
 %postun -n libdwarves1 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc README NEWS
 %_bindir/*
 %_mandir/man*/*
 
 %files -n libdwarves1
-%defattr(-,root,root)
 %_libdir/*.so.1*
 
 %files -n libdwarves-devel
-%defattr(-,root,root)
 %_libdir/*.so
 %_includedir/*
 %_datadir/%name
diff --git a/libbpf-0.0.3+git30.tar.xz b/libbpf-0.0.3+git30.tar.xz
deleted file mode 100644
index 2c8af20..0000000
--- a/libbpf-0.0.3+git30.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bce9f7729cfe9083b6442fbec9fad574e2ff52aff7cb235509c4e0da36896377
-size 117724
diff --git a/pahole-1.15.tar.gz b/pahole-1.15.tar.gz
deleted file mode 100644
index 1a3ec7f..0000000
--- a/pahole-1.15.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a84e183a0ef652e4198a161a20d9eeb45d3c153f5208e1cea833e1f28ae6207d
-size 168493