diff --git a/.gitignore b/.gitignore index 342dbe1..b193a8a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /v1.6.0.tar.gz /v1.7.0.tar.gz /netavark-v1.7.0-vendor.tar.gz +/v1.8.0.tar.gz +/netavark-v1.8.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 04c12aa..a5b3dd1 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,40 +2,47 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -# Build targets can be found at: -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/ -# and -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/ - specfile_path: rpm/netavark.spec upstream_tag_template: v{version} -jobs: - - &copr - job: copr_build - trigger: pull_request - owner: rhcontainerbot - project: packit-builds - enable_net: true - srpm_build_deps: - - cargo - - make - - openssl-devel +srpm_build_deps: + - cargo + - make + - openssl-devel - - <<: *copr - # Run on commit to main branch +jobs: + - job: copr_build + trigger: pull_request + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." + enable_net: true + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + - centos-stream+epel-next-8-x86_64 + - centos-stream+epel-next-8-aarch64 + - centos-stream+epel-next-9-x86_64 + - centos-stream+epel-next-9-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + # Run on commit to main branch + - job: copr_build trigger: commit + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main + owner: rhcontainerbot project: podman-next + enable_net: true - job: propose_downstream trigger: release update_release: false dist_git_branches: - fedora-all - actions: - pre-sync: - - "bash rpm/update-spec-provides.sh" - job: koji_build trigger: commit diff --git a/README.packit b/README.packit index 101115f..8b12de4 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.77.0.post2+g06f877b. +The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. diff --git a/netavark.spec b/netavark.spec index d16eece..6602387 100644 --- a/netavark.spec +++ b/netavark.spec @@ -19,20 +19,15 @@ %global debug_package %{nil} %endif -# copr_username is only set on copr environments owned by rhcontainerbot, -# not on other coprs or environments like koji. -%if %{defined copr_username} && "%{?copr_username}" == "rhcontainerbot" -%bcond_without copr -%endif - Name: netavark # Set a different Epoch for copr builds -%if %{with copr} +%if %{defined copr_username} Epoch: 102 %endif -Version: 1.7.0 +Version: 1.8.0 Release: %autorelease -License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT +# The `AND` needs to be uppercase in the License for SPDX compatibility +License: Apache-2.0 AND BSD-3-Clause AND MIT %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -44,7 +39,7 @@ URL: https://github.com/containers/%{name} Source0: %{url}/archive/v%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz BuildRequires: cargo -BuildRequires: go-md2man +BuildRequires: %{_bindir}/go-md2man # aardvark-dns and %%{name} are usually released in sync Recommends: aardvark-dns >= %{version}-1 Requires: (aardvark-dns >= %{version}-1 if fedora-release-identity-server) @@ -53,6 +48,7 @@ BuildRequires: make BuildRequires: protobuf-c BuildRequires: protobuf-compiler %if %{defined rhel} +# rust-toolset requires the `local` repo enabled on non-koji ELN build environments BuildRequires: rust-toolset %else BuildRequires: rust-packaging @@ -61,8 +57,6 @@ BuildRequires: rust-srpm-macros BuildRequires: git-core BuildRequires: systemd BuildRequires: systemd-devel -# DO NOT DELETE BELOW LINE - used for updating downstream imports -# vendored libraries %description %{summary} @@ -89,7 +83,7 @@ Its features include: # Following steps are only required on environments like koji which have no # network access and thus depend on the vendored tarball. Copr pulls # dependencies directly from the network. -%if %{without copr} +%if !%{defined copr_username} tar fx %{SOURCE1} mkdir -p .cargo @@ -106,7 +100,7 @@ EOF %{__make} CARGO="%{__cargo}" build cd docs -go-md2man -in %{name}.1.md -out %{name}.1 +%{__make} %install %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install diff --git a/sources b/sources index 0eea824..94739fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.7.0.tar.gz) = 52658b32cc03f157b4292e40918559700fcdd1cba633e34b396aeb0ed701ed308d1de45eba7f04865e89145367df772fdde91208f2475553e8db209426291844 -SHA512 (netavark-v1.7.0-vendor.tar.gz) = b10db3d36cc3e5ec453a458a9171661c0be5c09836ca7a659fa35a3d8a3ca4abb3a106074040be42aa80fee78189d8c1fdfd15347508cfb80d82ccbf0e0a7e31 +SHA512 (v1.8.0.tar.gz) = ff6061bb0fac20526425a35cdb5d1cb5e2548be7aaa0d77fdfcf6926175b64cee98461c6f1d87f7e64a1cf7e21911ec553fe06c50c8599ea2a86957a86c46eb5 +SHA512 (netavark-v1.8.0-vendor.tar.gz) = 78ee18c3ea4cd23ddd2553b14883b1c0a7caca4d67803333bdba4845ec6fa9c1e900f33619aef2ccfce1f7c05df1fa70a5dbcd6694d5a8402bc7bbd7763fefce