diff --git a/.gitignore b/.gitignore index b34ec1b3862ae19723c08f5e480c3cb1ef42df59..a95751721854736d455010d8b30a975b4d39ce33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -SOURCES/1.1.0.tar.gz -SOURCES/netavark-v1.1.0-vendor.tar.gz +/*.tar.gz +SOURCES/1.5.0.tar.gz +SOURCES/netavark-v1.5.0-vendor.tar.gz diff --git a/.netavark.metadata b/.netavark.metadata index 6c6f2d734730f45af5cda5cbd00ae907f1e8e7c1..8751de5e00d6663044aab3c3d4de3f02bb9e88d1 100644 --- a/.netavark.metadata +++ b/.netavark.metadata @@ -1,2 +1,2 @@ -5f22fd74fc25d71335f8ca5cd5aa74c383d30576 SOURCES/1.1.0.tar.gz -63dcfdcb2b5917a213f89469aa4e643f92230410 SOURCES/netavark-v1.1.0-vendor.tar.gz +32ce316af1558cef9a49aedddc0db5dd058f1f5d2a145ef8299a156f51743ffc86a1f299ffadf2955742965f5f0d11070b6363dad42cbeb3f5e7a3363f00d5f3 SOURCES/1.5.0.tar.gz +adf7ecf95e009aa2a6d925d52a8923bd0a2dddae87a0daf3a2240da09398ab582492e95d16eb89487c921643a1ed56c353bacd011a4cf65f49126aa7ac5e9203 SOURCES/netavark-v1.5.0-vendor.tar.gz diff --git a/SPECS/netavark.spec b/SPECS/netavark.spec index e0b950f0d1c61188c7c3857fd8060562eb25688e..2149c7e492616bd719ea9487221445d7ac8150be 100644 --- a/SPECS/netavark.spec +++ b/SPECS/netavark.spec @@ -3,8 +3,8 @@ Epoch: 2 Name: netavark -Version: 1.1.0 -Release: 6%{?dist} +Version: 1.5.0 +Release: 5%{?dist} License: ASL 2.0 and BSD and MIT ExclusiveArch: %{rust_arches} Summary: OCI network stack @@ -18,6 +18,11 @@ Provides: container-network-stack = 2 BuildRequires: make BuildRequires: rust-srpm-macros BuildRequires: git-core +BuildRequires: protobuf-compiler +BuildRequires: protobuf-c +BuildRequires: gcc +# https://github.com/containers/netavark/issues/578 +ExcludeArch: i686 %description %{summary} @@ -48,6 +53,13 @@ cat >.cargo/config << EOF [source.crates-io] replace-with = "vendored-sources" +[net] +offline = true + +[source."https://github.com/containers/netavark-dhcp-proxy"] +git = "https://github.com/containers/netavark-dhcp-proxy" +replace-with = "vendored-sources" + [source.vendored-sources] directory = "vendor" EOF @@ -68,6 +80,10 @@ cp %{SOURCE2} . %{_mandir}/man1/%{name}.1* %changelog +* Wed Mar 08 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-5 +- exclude i686 +- Related: #2123641 + * Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-6 - bump Epoch to preserve upgrade path - Related: #2061390