RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN
with the following as its source:
https://src.fedoraproject.org/rpms/podman#d66a027ff9b64df0d511369f8ce17d128f14b421
This commit is contained in:
Troy Dawson 2020-11-18 09:44:44 -08:00
parent 70aa8ac546
commit e6d61ec32a
3 changed files with 74 additions and 8 deletions

11
.gitignore vendored
View File

@ -1393,3 +1393,14 @@
/podman-7ffcab0.tar.gz
/podman-35b4cb1.tar.gz
/podman-287edd4.tar.gz
/podman-07293bc.tar.gz
/podman-e2b82e6.tar.gz
/podman-da01191.tar.gz
/podman-e443c01.tar.gz
/podman-6c2503c.tar.gz
/podman-0b1a60e.tar.gz
/podman-4eb9c28.tar.gz
/podman-3920756.tar.gz
/podman-42ec4cf.tar.gz
/podman-286d356.tar.gz
/dnsname-a9c2a10.tar.gz

View File

@ -32,14 +32,14 @@
# To build a random user's fork/commit, comment out above line,
# uncomment below line and replace the placeholders and commit0 below with the right info
#%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO
%global commit0 287edd4e214f09a695ceb074c14f8b72f6695e1f
%global commit0 286d356db03a2511722155022c19855f8aee73cf
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global repo_plugins dnsname
# https://github.com/containers/dnsname
%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins}
%global git_plugins https://%{import_path_plugins}
%global commit_plugins 8a6a8a4e1e609aaeb1f57f7e7a1c8523cd373040
%global commit_plugins a9c2a10a3a24e082996cf2d9edb1cee295651413
%global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7})
# Used for comparing with latest upstream tag
@ -57,7 +57,7 @@ Version: 2.2.0
# N.foo if released, 0.N.foo if unreleased
# Rawhide almost always ships unreleased builds,
# so release tag should be of the form 0.N.foo
Release: 0.39.dev.git%{shortcommit0}%{?dist}
Release: 0.55.dev.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
URL: https://%{name}.io/
@ -410,6 +410,7 @@ file. Each CNI network will have its own dnsmasq instance.
%prep
%autosetup -Sgit -n %{name}-%{commit0}
rm -f docs/source/markdown/containers-mounts.conf.5.md
# untar dnsname
tar zxf %{SOURCE1}
@ -454,8 +455,6 @@ popd
%{__make} docs
%install
rm -rf docs/containers-mounts.conf.5.md
install -dp %{buildroot}%{_unitdir}
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
install.bin-nobuild \
@ -565,10 +564,12 @@ exit 0
%license LICENSE
%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
%{_bindir}/%{name}
%{_datadir}/bash-completion/completions/*
%{_datadir}/bash-completion/completions/%{name}
# By "owning" the site-functions dir, we don't need to Require zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_%{name}
%dir %{_datadir}/fish/vendor_completions.d
%{_datadir}/fish/vendor_completions.d/%{name}.fish
%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
%{_unitdir}/%{name}-auto-update.service
%{_unitdir}/%{name}-auto-update.timer
@ -578,6 +579,7 @@ exit 0
%{_userunitdir}/%{name}-auto-update.timer
%{_userunitdir}/%{name}.service
%{_userunitdir}/%{name}.socket
%{_usr}/lib/tmpfiles.d/%{name}.conf
%files docker
%{_bindir}/docker
@ -603,6 +605,11 @@ exit 0
%license LICENSE
%{_bindir}/%{name}-remote
%{_mandir}/man1/%{name}-remote*.*
%{_datadir}/bash-completion/completions/%{name}-remote
%dir %{_datadir}/fish/vendor_completions.d
%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_%{name}-remote
#%%{_datadir}/man/man5/%%{name}-remote*.*
%files tests
@ -617,6 +624,54 @@ exit 0
# rhcontainerbot account currently managed by lsm5
%changelog
* Wed Nov 18 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-0.55.dev.git286d356
- bump dnsname to v1.1.0, commit a9c2a10
* Wed Nov 18 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.54.dev.git286d356
- autobuilt 286d356
* Tue Nov 17 2020 Eduardo Santiago <santiago@redhat.com> - 2:2.2.0-0.53.dev.git42ec4cf
- slight correction to the path of the containers-mounts source file
* Tue Nov 17 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-0.52.dev.git42ec4cf
- containers-mounts.conf.5 in containers-common
* Tue Nov 17 2020 Eduardo Santiago <santiago@redhat.com> - 2:2.2.0-0.51.dev.git42ec4cf
- completion files: be smarter, package -remote files only with -remote
* Tue Nov 17 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.50.dev.git42ec4cf
- autobuilt 42ec4cf
* Sun Nov 15 2020 Eduardo Santiago <santiago@redhat.com> - 2:2.2.0-0.49.dev.git3920756
- package new zsh and fish completion files
* Sun Nov 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.48.dev.git3920756
- autobuilt 3920756
* Sat Nov 14 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.47.dev.git4eb9c28
- autobuilt 4eb9c28
* Fri Nov 13 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.46.dev.git0b1a60e
- autobuilt 0b1a60e
* Thu Nov 12 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.45.dev.git6c2503c
- autobuilt 6c2503c
* Wed Nov 11 2020 Eduardo Santiago <santiago@redhat.com> - 2:2.2.0-0.44.dev.gite443c01
- distribute newly-added /usr/lib/tmpfiles.d/podman.conf
* Wed Nov 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.43.dev.gite443c01
- autobuilt e443c01
* Tue Nov 10 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.42.dev.gitda01191
- autobuilt da01191
* Sat Nov 7 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.41.dev.gite2b82e6
- autobuilt e2b82e6
* Fri Nov 6 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.40.dev.git07293bc
- autobuilt 07293bc
* Fri Oct 23 2020 ashley-cui <acui@redhat.com> - 2:2.2.0-0.39.dev.git287edd4
- rebuild

View File

@ -1,2 +1,2 @@
SHA512 (dnsname-8a6a8a4.tar.gz) = 7ee1edd091264f804056c69d5eac0ef8e825cbdae268caeed12700c966724c57348a14aee509e9ab559be349025b0c5357f441c3b4e34c3c02568a51ae223401
SHA512 (podman-287edd4.tar.gz) = 509df8fbd803bd260de7c1a782a6d5153a3dcac9d77f60c08a1448b5e2b30561a7e16da2d3697dc85dd560b8168780c7d4a67f0b6733f890bde78924cde16866
SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868
SHA512 (podman-286d356.tar.gz) = da61f642ec7c956cdd36b416ec9b79f433bb8ebb8c9f1196c04cba3adea80fba248d3b52bf4ac7d830f1d282280167840033a6d5f4a90e08e029137fa59d44cd