From 3aa9754352a4e4714c4adf6ea480b77bc6240a1f Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Sun, 17 Mar 2019 09:16:57 -0600 Subject: [PATCH] Package zsh completion. Note that we declare ownership of /usr/share/zsh/site-functions (directory). This seems to be legit; see curl and mercurial packages. The alternatives are to explicitly Require: zsh or to bundle the completion script in a separate rpm. Signed-off-by: Ed Santiago --- .gitignore | 1 + podman.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 80722a4..f08e4d4 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,4 @@ /libpod-883566f.tar.gz /libpod-7426d4f.tar.gz /libpod-31f11a8.tar.gz +/libpod-6aa8078.tar.gz diff --git a/podman.spec b/podman.spec index 466ebce..4fca5fe 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 31f11a8a9bddc4dcfc22463097b852fcdc9f0172 +%global commit0 6aa8078cc1f54a5c6e6197d7e0273e36ed55060e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -44,7 +44,7 @@ Epoch: 2 Epoch: 1 %endif Version: 1.2.0 -Release: 18.dev.git%{shortcommit0}%{?dist} +Release: 19.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -504,6 +504,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +# By "owning" the site-functions dir, we don't need to Require zsh +%{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/* %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf @@ -537,6 +540,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Mon Mar 18 2019 Eduardo Santiago - 2:1.2.0-19.dev.git6aa8078 +- include zsh completion + * Fri Mar 15 2019 Lokesh Mandvekar (Bot) - 2:1.2.0-18.dev.git31f11a8 - autobuilt 31f11a8 diff --git a/sources b/sources index c7ab57b..2e58642 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-31f11a8.tar.gz) = af358f9587d9bcf029e5535499afdac9d63c2563b1f48e03a70ad2a29baa978f6e5cf88a2d2c89345d92a9e234cd2ee5c0e65898cf88264f802b7c1325e081da +SHA512 (libpod-6aa8078.tar.gz) = bad4f304fc2ee4e48cf6cd6ed55bbf811f5a47ff6d4b57d5138f4675766a0815abdba1dd9bd8fd5aaef87fabaf8b59fb2bf29ab89688fe98b3bca3b2cb8292fa