Accepting request 833026 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/833026
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=69

podman.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep  8 13:41:21 UTC 2020 - Ralf Haferkamp <rhafer@suse.com>
+
+- Cleanup %install section to use "make install"
+- install missing systemd units for the new Rest API (bsc#1175957)
+  and a few man-pages that where missing before
+- Drop varlink API related bits (in favor of the new API)
+- fix install location for zsh completions
+
 -------------------------------------------------------------------
 Wed Sep  2 00:06:42 UTC 2020 - Michael Ströder <michael@stroeder.com>
 

podman.spec

@@ -116,21 +116,11 @@ make %{?_smp_mflags} docs
 # Updates must be tested manually.
 
 %install
+make DESTDIR=%{buildroot} PREFIX=/usr install
+make DESTDIR=%{buildroot} PREFIX=/usr install.completions
 
-# libpod
+# packaged in libcontainers-common
-cd $HOME/go/src/%{project}
+rm %{buildroot}/usr/share/man/man5/containers-mounts.conf.* %{buildroot}/usr/share/man/man5/oci-hooks.*
-install -D -m 0755 bin/podman         %{buildroot}/%{_bindir}/podman
-install -D -m 0755 bin/podman-remote  %{buildroot}/%{_bindir}/podman-remote
-install -d %{buildroot}/%{_mandir}/man1
-install -m 0644 docs/build/man/podman*.1 %{buildroot}/%{_mandir}/man1
-install -D -m 0644 cni/87-podman-bridge.conflist %{buildroot}/%{_sysconfdir}/cni/net.d/87-podman-bridge.conflist
-install -D -m 0644 completions/bash/podman %{buildroot}/%{_datadir}/bash-completion/completions/podman
-install -D -m 0644 completions/zsh/_podman %{buildroot}%{_sysconfdir}/zsh_completion.d/_podman
-
-# podman varlink
-install -D -m 0644 contrib/varlink/podman.conf %{buildroot}/%{_tmpfilesdir}/podman.conf
-install -D -m 0644 contrib/varlink/io.podman.service %{buildroot}%{_unitdir}/io.podman.service
-install -D -m 0644 contrib/varlink/io.podman.socket %{buildroot}%{_unitdir}/io.podman.socket
 
 # Add podman modprobe.d drop-in config
 mkdir -p %{buildroot}%{_prefix}/lib/modules-load.d
@@ -157,11 +147,11 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE
 %{_prefix}/lib/modules-load.d/podman.conf
 # Completion
 %{_datadir}/bash-completion/completions/podman
-%{_sysconfdir}/zsh_completion.d/_podman
+%{_datadir}/zsh/site-functions/_podman
-# Varlink
+%{_unitdir}/podman.service
-%{_tmpfilesdir}/podman.conf
+%{_unitdir}/podman.socket
-%{_unitdir}/io.podman.service
+%{_userunitdir}/podman.service
-%{_unitdir}/io.podman.socket
+%{_userunitdir}/podman.socket
 %ghost /run/podman
 %ghost  %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-libpodconf
 %license LICENSE
@@ -171,20 +161,19 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE
 %license LICENSE
 
 %pre
-%service_add_pre io.podman.service io.podman.socket
+%service_add_pre podman.service podman.socket
 # move away any old rpmsave config file to avoid having it re-activated again in
 # %posttrans
 test -f /etc/containers/libpod.conf.rpmsave && mv -v /etc/containers/libpod.conf.rpmsave /etc/containers/libpod.conf.rpmsave.old ||:
 
 %post
-%service_add_post io.podman.service io.podman.socket
+%service_add_post podman.service podman.socket
-%tmpfiles_create %{_tmpfilesdir}/podman.conf
 
 %preun
-%service_del_preun io.podman.service io.podman.socket
+%service_del_preun podman.service podman.socket
 
 %postun
-%service_del_postun io.podman.service io.podman.socket
+%service_del_postun podman.service podman.socket
 
 %posttrans
 # if libpod.conf.rpmsave was created move it back into place and set an update