diff --git a/.gitignore b/.gitignore index 895cddf..a4e35cb 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /netavark-v1.10.0-vendor.tar.gz /v1.10.1.tar.gz /netavark-v1.10.1-vendor.tar.gz +/v1.10.2.tar.gz +/netavark-v1.10.2-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index a5b3dd1..4c398f1 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -49,7 +49,10 @@ jobs: dist_git_branches: - fedora-all - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-branched # rawhide updates are created automatically + # NOTE: Bodhi update tasks are disabled to allow netavark and aardvark-dns X.Y + # builds in a single manual bodhi update. Leaving this commented out + # but not deleted so it's not forgotten. + #- job: bodhi_update + #trigger: commit + #dist_git_branches: + #- fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit index bba9424..9a6e969 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.89.0.post1.dev4+gabf90471. +The file was generated using packit 0.90.0.post1.dev3+g3d9551d2. diff --git a/netavark.spec b/netavark.spec index 1d57b27..f1f5230 100644 --- a/netavark.spec +++ b/netavark.spec @@ -19,12 +19,17 @@ %global debug_package %{nil} %endif +# Minimum X.Y dep for aardvark-dns +%define major_minor %((v=%{version}; echo ${v%.*})) + Name: netavark # Set a different Epoch for copr builds %if %{defined copr_username} Epoch: 102 +%else +Epoch: 0 %endif -Version: 1.10.1 +Version: 1.10.2 Release: %autorelease # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-3-Clause AND MIT @@ -40,8 +45,9 @@ Source0: %{url}/archive/v%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz BuildRequires: cargo BuildRequires: %{_bindir}/go-md2man -Recommends: aardvark-dns -Requires: (aardvark-dns if fedora-release-identity-server) +# aardvark-dns and %%{name} are usually released in sync +Recommends: aardvark-dns >= %{epoch}:%{major_minor} +Requires: (aardvark-dns >= %{epoch}:%{major_minor} if fedora-release-identity-server) Provides: container-network-stack = 2 BuildRequires: make BuildRequires: protobuf-c diff --git a/sources b/sources index 052e1eb..c726e1b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.10.1.tar.gz) = affce4d4d5c81ac04da4093d52f4197da3b37c242d1a499a4ea2836579671b89f809d9cc9c9aa7532c21a2c01089ee3ab6448ed9af0cb43d473ec56c2571e96c -SHA512 (netavark-v1.10.1-vendor.tar.gz) = 7c03fe4323779d0da094bfd9288acfbf17af4258dbe73cafd6a8b27d8b77da3f9dd24632a509f9e08f17ec83c0aa966cd5cb2f7ad76e8f84b507b9b127b7689e +SHA512 (v1.10.2.tar.gz) = ca92e283bbbb4f533c705ef598a00127aed3aeb8fc30591806c0d2411c7b14074be04ae8e5c303f5f43546b4f1db4e9767c8736eab83761295df7472612f3cfc +SHA512 (netavark-v1.10.2-vendor.tar.gz) = a5079b724d25af60cc094dd5c0bc9e01d503f64bee7ef1c8e616e79793726d848a5e000d951f02d2516f10feea23e30ab637b37ae09da5580f4edb1e783240c0