import UBI netavark-1.7.0-1.el9

This commit is contained in:
eabdullin 2023-11-07 12:12:30 +00:00
parent 6b656f45df
commit 15769c8b87
3 changed files with 18 additions and 30 deletions

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/netavark-1.5.1-8a6d81c.tar.gz SOURCES/1.7.0.tar.gz
SOURCES/netavark-v1.5.1-vendor.tar.gz SOURCES/netavark-v1.7.0-vendor.tar.gz

View File

@ -1,2 +1,2 @@
1801a1263234f932aec8ccd7e1aac72ca233d7c5 SOURCES/netavark-1.5.1-8a6d81c.tar.gz 1f94c6642ee9c6d033a50d56f960a28cede6f3ed SOURCES/1.7.0.tar.gz
23424f386f3968ddf6e3f29ae65320f71b7bf45a SOURCES/netavark-v1.5.1-vendor.tar.gz 48f77690b2123394dd2c2ff95231b7a4733b27ab SOURCES/netavark-v1.7.0-vendor.tar.gz

View File

@ -1,14 +1,10 @@
# debuginfo doesn't work yet # debuginfo doesn't work yet
%global debug_package %{nil} %global debug_package %{nil}
#%%global branch v1.5.0-rhel
%global commit0 8a6d81c51b2a130a3c93d94587df81053e208e05
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Epoch: 2 Epoch: 2
Name: netavark Name: netavark
Version: 1.5.1 Version: 1.7.0
Release: 2%{?dist} Release: 1%{?dist}
License: ASL 2.0 and BSD and MIT License: ASL 2.0 and BSD and MIT
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
# this is needed for go-md2man # this is needed for go-md2man
@ -17,11 +13,7 @@ ExclusiveArch: %{go_arches}
ExcludeArch: i686 ExcludeArch: i686
Summary: OCI network stack Summary: OCI network stack
URL: https://github.com/containers/%{name} URL: https://github.com/containers/%{name}
%if 0%{?branch:1} Source0: %{url}/archive/v%{version}/%{version}.tar.gz
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
Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
BuildRequires: cargo BuildRequires: cargo
BuildRequires: /usr/bin/go-md2man BuildRequires: /usr/bin/go-md2man
@ -55,11 +47,7 @@ Its features include:
* Support for container DNS resolution via aardvark-dns. * Support for container DNS resolution via aardvark-dns.
%prep %prep
%if 0%{?branch:1} %autosetup -Sgit
%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
%else
%autosetup -Sgit -n %{name}-%{commit0}
%endif
tar fx %{SOURCE1} tar fx %{SOURCE1}
mkdir -p .cargo mkdir -p .cargo
@ -91,21 +79,21 @@ go-md2man -in %{name}.1.md -out %{name}.1
%license LICENSE %license LICENSE
%dir %{_libexecdir}/podman %dir %{_libexecdir}/podman
%{_libexecdir}/podman/%{name} %{_libexecdir}/podman/%{name}
/usr/lib/systemd/system/*
%{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}.1*
%changelog %changelog
* Wed Jun 07 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.1-2 * Mon Jul 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-1
- update to 1.5.1 bugfix release - update to https://github.com/containers/netavark/releases/tag/v1.7.0
- Resolves: #2211542 - Related: #2176063
* Wed Jun 07 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-4 * Mon Jun 12 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.6.0-2
- update to the latest content of https://github.com/containers/netavark/tree/v1.5.0-rhel - rebuild
(https://github.com/containers/netavark/commit/8a6d81c) - Resolves: #2188340
- Resolves: #2211542
* Thu Apr 20 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-3 * Wed Apr 12 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.6.0-1
- fix --dns-add command is not functioning - update to https://github.com/containers/netavark/releases/tag/v1.6.0
- Resolves: #2182898 - Related: #2176063
* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2 * Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
- fix build - thank to Paul Holzinger - fix build - thank to Paul Holzinger