From 60edeb5576ed4a65c134f6328770e95c1aae65d1 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Mon, 22 May 2023 13:41:34 +0200
Subject: [PATCH] netavark-1.6.0-1.el8

- update to https://github.com/containers/netavark/releases/tag/v1.6.0
- Related: #2176055

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 .gitignore    |  3 +--
 netavark.spec | 25 +++++++++----------------
 sources       |  4 ++--
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index c291e03..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/netavark-v1.5.0-vendor.tar.gz
-/v1.5.0-530dacd.tar.gz
+/*.tar.gz
diff --git a/netavark.spec b/netavark.spec
index ac0fc99..bcf3a97 100644
--- a/netavark.spec
+++ b/netavark.spec
@@ -1,23 +1,15 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
-%global branch v1.5.0
-%global commit0 530dacd1ff48b2ad2b0cb1f1ee1ba78c8274a3b7
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 Epoch: 2
 Name: netavark
-Version: 1.5.0
-Release: 5%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
 License: ASL 2.0 and BSD and MIT
 ExclusiveArch: %{rust_arches}
 Summary: OCI network stack
 URL: https://github.com/containers/%{name}
-%if 0%{?branch:1}
-Source0: https://github.com/containers/%{name}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
-%else
-Source0: https://github.com/containers/%{name}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
-%endif
+Source0: %{url}/archive/v%{version}/%{version}.tar.gz
 Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
 Source2: netavark.1
 BuildRequires: cargo
@@ -53,11 +45,7 @@ Its features include:
 * Support for container DNS resolution via aardvark-dns.
 
 %prep
-%if 0%{?branch:1}
-%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
-%else
-%autosetup -Sgit -n %{name}-%{commit0}
-%endif
+%autosetup -Sgit
 tar fx %{SOURCE1}
 mkdir -p .cargo
 
@@ -89,9 +77,14 @@ cp %{SOURCE2} .
 %license LICENSE
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
+/usr/lib/systemd/system/*
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon May 22 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.6.0-1
+- update to https://github.com/containers/netavark/releases/tag/v1.6.0
+- Related: #2176055
+
 * Thu Apr 20 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-5
 - fix --dns-add command is not functioning
 - Resolves: #2182897
diff --git a/sources b/sources
index be0da92..c2def1f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (netavark-v1.5.0-vendor.tar.gz) = adf7ecf95e009aa2a6d925d52a8923bd0a2dddae87a0daf3a2240da09398ab582492e95d16eb89487c921643a1ed56c353bacd011a4cf65f49126aa7ac5e9203
-SHA512 (v1.5.0-530dacd.tar.gz) = ab53216ace4312cbfd683773de053cd8c5baefd383efcbf05e37eec247fb73895e3d95cc884baeb6185471a5e23f7360798630503fecb78e6be5a52376f965f8
+SHA512 (1.6.0.tar.gz) = a09d055f0e705ac111c00218c637b35b7986cbe36b8463fd040ffbdce5f31ba631fa6efac0c6cb70ea7c83321cac89d7d178c296cf0d0609524618e8de61c069
+SHA512 (netavark-v1.6.0-vendor.tar.gz) = 741b0712bb7888ba59c7c1c03d6cdfa0fee3898219a049270c658d55f33e46d9eab43aa09a93599edc04ba61f6e194cf724cc7007fcf92526bd666ad0f7ad422