Compare commits

...

No commits in common. "imports/c8-stream-rhel8/netavark-1.7.0-2.module+el8.9.0+21243+a586538b" and "c8-beta" have entirely different histories.

3 changed files with 8 additions and 78 deletions

4
.gitignore vendored
View File

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

View File

@ -1,2 +1,2 @@
48f77690b2123394dd2c2ff95231b7a4733b27ab SOURCES/netavark-v1.7.0-vendor.tar.gz
738f3e70198bd76da27fe9506943effd8b7a61a5 SOURCES/v1.7.0-rhel-4335c93.tar.gz
5f22fd74fc25d71335f8ca5cd5aa74c383d30576 SOURCES/1.1.0.tar.gz
63dcfdcb2b5917a213f89469aa4e643f92230410 SOURCES/netavark-v1.1.0-vendor.tar.gz

View File

@ -1,23 +1,15 @@
# debuginfo doesn't work yet
%global debug_package %{nil}
%global branch v1.7.0-rhel
%global commit0 4335c93224d9667f62e9ba382d9eae314a19c706
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Epoch: 2
Name: netavark
Version: 1.7.0
Release: 2%{?dist}
Version: 1.1.0
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%{?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
@ -26,11 +18,6 @@ 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}
@ -53,11 +40,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
@ -65,13 +48,6 @@ 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
@ -89,55 +65,9 @@ cp %{SOURCE2} .
%license LICENSE
%dir %{_libexecdir}/podman
%{_libexecdir}/podman/%{name}
/usr/lib/systemd/system/*
%{_mandir}/man1/%{name}.1*
%changelog
* Wed Nov 15 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-2
- update to the latest content of https://github.com/containers/netavark/tree/v1.7.0-rhel
(https://github.com/containers/netavark/commit/4335c93)
- Resolves: RHEL-16299
* Mon Jul 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.7.0
- Related: #2176055
* 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
* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-4
- exclude i686
- Related: #2123641
* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-3
- update build parameters
- Related: #2123641
* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
- always stay offline during build
- Related: #2123641
* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.5.0
- Related: #2123641
* Thu Dec 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.4.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.4.0
- Related: #2123641
* Mon Nov 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.3.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.3.0
- Related: #2123641
* Wed Sep 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.2.0-1
- update to https://github.com/containers/netavark/releases/tag/v1.2.0
- Resolves: #2116481
* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-6
- bump Epoch to preserve upgrade path
- Related: #2061390