#15 Package zsh completion.
Merged 5 years ago by lsm5. Opened 5 years ago by santiago.
rpms/ santiago/podman zsh_completion_f29  into  f29

file modified
+1
@@ -114,3 +114,4 @@ 

  /libpod-006206a.tar.gz

  /libpod-0ad9b6b.tar.gz

  /libpod-b33a00e.tar.gz

+ /libpod-6aa8078.tar.gz

file modified
+8 -2
@@ -21,7 +21,7 @@ 

  %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}

  %global import_path %{provider_prefix}

  %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}

- %global commit0 b33a00ef96601d7ce2389ac634e86847239d7d2e

+ %global commit0 6aa8078cc1f54a5c6e6197d7e0273e36ed55060e

  %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})

  

  %global import_path_conmon github.com/kubernetes-sigs/cri-o
@@ -38,7 +38,7 @@ 

  Epoch: 0

  %endif

  Version: 1.1.2

- Release: 2.git%{shortcommit0}%{?dist}

+ Release: 3.git%{shortcommit0}%{?dist}

  Summary: Manage Pods, Containers and Container Images

  License: ASL 2.0

  URL: https://podman.io/
@@ -498,6 +498,9 @@ 

  %{_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
@@ -527,6 +530,9 @@ 

  %{_datadir}/%{name}/test

  

  %changelog

+ * Sun Mar 17 2019 Eduardo Santiago <santiago@redhat.com> - 1:1.1.2-3.git6aa8078

+ - include zsh completion

+ 

  * Mon Mar 11 2019 Eduardo Santiago <santiago@redhat.com> - 1:1.1.2-2.git55dc783

  - new -tests subpackage

  

file modified
+1 -1
@@ -1,2 +1,2 @@ 

  SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d

- SHA512 (libpod-b33a00e.tar.gz) = a682d6e79d23f31ec9a969cacdf108f3c0b21cf61bd8f9cb329f272c237777a15f68e6b74b7217d99985d41e75b3b7d9b9bfe4c5c84c8194ba082a288f1bdce1

+ SHA512 (libpod-6aa8078.tar.gz) = bad4f304fc2ee4e48cf6cd6ed55bbf811f5a47ff6d4b57d5138f4675766a0815abdba1dd9bd8fd5aaef87fabaf8b59fb2bf29ab89688fe98b3bca3b2cb8292fa

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 santiago@redhat.com

Hmm, I guess a podman-zsh-completion subpackage might be better, so we can keep zsh dirs and files to those who explicitly want zsh. See https://src.fedoraproject.org/rpms/docker/blob/master/f/docker.spec#_461-468 .

Let me know if you think subpackage is a bad idea though.

Ha sorry I didn't read your original comment about alternatives. Anyway, I prefer subpackage, but if anyone disagrees, do let me know.

I see subpackages for docker, docker-latest, and moby; also something called quodlibet. The problem I see with a subpackage is that users are unlikely to know of its existence; they'll just assume podman has none. Also, on a multiuser system, a sysadmin is unlikely to install it by default. Since the /usr/share/zsh/site-functions directory already exists, even without curl or mercurial (systemd installs files in it), I think it's low-risk and high-benefit to include completion as part of the podman package.
Maybe there's a best-practices document somewhere; I'll take some time tomorrow to look.

I don't want to require anything, and I think zsh is too small of a feature to have an additional subpackage.

alright, fine by me.

Pull-Request has been merged by lsm5

5 years ago

@santiago can you send PRs for master and f30 as well?

@lsm5 of course; I was waiting to see how this one went. Thank you!

ha, let me get this built. Going by scratch build you posted, looks fine to me

ah nvm me, i see you meant PR review :)

I'll build all 3 branches after the PRs for the other 2 branches are merged.