.gitignore

@@ -1,2 +1,2 @@
+SOURCES/1.1.0.tar.gz
 SOURCES/netavark-v1.1.0-vendor.tar.gz
-SOURCES/v1.1.0-rhel-e868e02.tar.gz

.netavark.metadata

@@ -1,2 +1,2 @@
-715b18551c34835b47e0861a09a2baa8d3aa23dd SOURCES/netavark-v1.1.0-vendor.tar.gz
-99af68089204eb3e5ba6fc93722137799454733f SOURCES/v1.1.0-rhel-e868e02.tar.gz
+5f22fd74fc25d71335f8ca5cd5aa74c383d30576 SOURCES/1.1.0.tar.gz
+63dcfdcb2b5917a213f89469aa4e643f92230410 SOURCES/netavark-v1.1.0-vendor.tar.gz

SPECS/netavark.spec

@@ -1,25 +1,16 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
-%global netavark_version v1.1.0
-%global netavark_branch v1.1.0-rhel
-%global netavark_commit0 e868e02552bd1be28d8eb6a193f2e92b0e0643bf
-%global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
-
 Epoch: 2
 Name: netavark
 Version: 1.1.0
-Release: 7%{?dist}
+Release: 6%{?dist}
 License: ASL 2.0 and BSD and MIT
 ExclusiveArch: %{rust_arches}
 Summary: OCI network stack
 URL: https://github.com/containers/%{name}
-%if 0%{?netavark_branch:1}
-Source0: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz
-%else
-Source0: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz
-%endif
-Source1: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_version}-vendor.tar.gz
+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
 Recommends: aardvark-dns >= 1.0.3
@@ -49,13 +40,7 @@ Its features include:
 * Support for container DNS resolution via aardvark-dns.
 
 %prep
-tar fx %{SOURCE0}
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
-
+%autosetup -Sgit
 tar fx %{SOURCE1}
 mkdir -p .cargo
 
@@ -68,41 +53,21 @@ directory = "vendor"
 EOF
 
 %build
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
-%__scm_setup_git -q
 %{__make} build
 
 cd docs
 cp %{SOURCE2} .
 
 %install
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 
 %files
-%if 0%{?netavark_branch:1}
-%license containers-netavark-%{netavark_shortcommit0}/LICENSE
-%else
-%license netavark-%{netavark_commit0}/LICENSE
-%endif
+%license LICENSE
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Tue Oct 25 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-7
-- fix "Two aardvark-dns instances trying to use the same port
-  on the same interface"
-- Resolves: #2130234
-
 * Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-6
 - bump Epoch to preserve upgrade path
 - Related: #2061390