Accepting request 588480 from devel:CaaSP:Head:ControllerNode

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

_service

@@ -4,8 +4,8 @@
 <param name="url">https://github.com/projectatomic/libpod.git</param>
 <param name="scm">git</param>
 <param name="filename">podman</param>
-<param name="versionformat">git.%H</param>
+<param name="versionformat">0.3.3</param>
-<param name="revision">v0.3.1</param>
+<param name="revision">v0.3.3</param>
 </service>
 
 <service name="recompress" mode="disabled">
@@ -13,4 +13,8 @@
 <param name="compression">xz</param>
 </service>
 
+<service name="set_version" mode="disabled">
+<param name="basename">podman</param>
+</service>
+
 </services>

podman-0.3.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aca4e878488e509a1e678c75e38b6ada59c4b9e1846153adf2266b64ef2a54ca
+size 4600612

podman-git.98b95ff47f8387f47687fb2d1377b722bd6a2915.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cfd88417ceffb0e7833ea2361af91e0f5d8c950aa784ace07ee0d1cbc2aedc9f
-size 4614252

podman.changes

@@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Mon Mar 19 09:47:24 UTC 2018 - vrothberg@suse.com
+
+- Remove old (redundant) source archive.
+
+-------------------------------------------------------------------
+Sat Mar 17 10:36:53 UTC 2018 - vrothberg@suse.com
+
+- Do not compile commit hash into binary. `podman version` will not print
+  the commit number as we are now following official releases.
+
+- Change tar naming from commit to version to facilitate updates via the
+  _service file.
+
+- Update podman to v0.3.3.  This update includes several fixes and a new
+  configuration file, libpod.conf.  By default, this config will be
+  installed to /usr/share/containers and /etc/containers, whereas podman
+  will always use the latter if present.  The config in
+  /usr/share/containers can be used to check for new config options and
+  will be replaced with each package update.  The libpod.conf config can
+  be used to tweak some run-time paths of conmon, runc, etc., which is a
+  more flexible approach than hard-coding those paths in podman.
+
+  Changelog:
+  * Update containers/image
+  * Add restart to main podman manpage
+  * Add podman restart to podman bash completions and commands
+  * Make manpage more clear
+  * Add 'podman restart' command
+  * Remove ability to specify mount label when mounting
+  * Add signal proxying to podman run, start, and attach
+  * We should not allow a user to mount a container with a different label
+  * We should not have a default workdir
+  * Add additional debug logging
+  * Implement container restarting
+  * sleep does not catch SIGTERM
+  * Include tmpfs in inspect
+  * Add run and search to commands page
+  * Add new default location for conmon
+  * podman-images: return correct image list
+  * Remove crio.conf references from manpages
+  * Fix a potential race around container removal in ps
+  * podman ps command string too long
+  * Podman load can pull in compressed files
+  * Fix Conmon error to display Conmon paths
+  * Add support to load runtime configuration from config file
+  * Add default libpod config file
+  * Change conmon and runtime paths to arrays
+  * Update containers/storage to fix locking bug
+
+-------------------------------------------------------------------
+Thu Mar 15 15:24:23 UTC 2018 - vrothberg@suse.com
+
+- Add requirement on cni-plugins to avoid potential issues in the
+  future.
+  feature#crio
+
+-------------------------------------------------------------------
+Tue Mar  6 11:00:09 UTC 2018 - vrothberg@suse.com
+
+- Add run-time requirement on buildah to support `podman build`.
+  feature#crio
+
+-------------------------------------------------------------------
+Tue Mar  6 08:01:37 UTC 2018 - vrothberg@suse.com
+
+- Fix typo when setting the git commit at compile time.
+
 -------------------------------------------------------------------
 Sat Mar  3 14:20:06 UTC 2018 - vrothberg@suse.com
 

podman.spec

@@ -17,19 +17,18 @@
 
 
 %define project github.com/projectatomic/libpod
-%define commit 98b95ff47f8387f47687fb2d1377b722bd6a2915
 # Build with libostree-devel in Tumbleweed, Leap 15 and SLES 15
 %if 0%{?suse_version} >= 1500
 %define with_libostree 1
 %endif
 Name:           podman
-Version:        0.3.1
+Version:        0.3.3
 Release:        0
 Summary:        Debugging tool for pods and images
 License:        Apache-2.0
 Group:          System/Management
 Url:            https://github.com/projectatomic/libpod
-Source0:        %{name}-git.%{commit}.tar.xz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
 BuildRequires:  bash-completion
 BuildRequires:  cni
@@ -42,10 +41,13 @@ BuildRequires:  golang-packaging
 BuildRequires:  libapparmor-devel
 BuildRequires:  libassuan-devel
 BuildRequires:  libbtrfs-devel
+BuildRequires:  libcontainers-common
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
 BuildRequires:  golang(API) >= 1.7
+Requires:       buildah
 Requires:       cni
+Requires:       cni-plugins
 Requires:       cri-o
 Requires:       libcontainers-common
 Requires:       libcontainers-image
@@ -67,7 +69,7 @@ shares state with crio and so has the capability to debug pods/images created
 by crio.
 
 %prep
-%setup -q -n %{name}-git.%{commit}
+%setup -q
 
 %build
 # We can't use symlinks here because go-list gets confused by symlinks, so we
@@ -88,7 +90,7 @@ export BUILDTAGS="seccomp apparmor containers_image_ostree_stub"
 
 # Build podman
 go build -tags "$BUILDTAGS" \
-         -i -ldflags '-s -w -X main.podmanVersion=%{version} -X main.gitCommit=%{git_commit}' \
+         -i -ldflags '-s -w -X main.podmanVersion=%{version}' \
          -o bin/podman \
          %{project}/cmd/podman
 
@@ -109,6 +111,8 @@ install -d %{buildroot}/%{_mandir}/man1
 install -m 0644 docs/podman-*.1 %{buildroot}/%{_mandir}/man1
 # Configs
 install -D -m 0644 cni/87-podman-bridge.conflist %{buildroot}/%{_sysconfdir}/cni/net.d/87-podman-bridge.conflist
+install -D -m 0644 libpod.conf %{buildroot}/%{_sysconfdir}/containers/libpod.conf
+install -D -m 0644 libpod.conf %{buildroot}/%{_datadir}/containers/libpod.conf
 # Completion
 install -D -m 0644 completions/bash/podman %{buildroot}/%{_sysconfdir}/bash_completion.d/podman
 
@@ -121,6 +125,9 @@ install -D -m 0644 completions/bash/podman %{buildroot}/%{_sysconfdir}/bash_comp
 %{_mandir}/man1/podman-*
 # Configs
 %config %{_sysconfdir}/cni/net.d/87-podman-bridge.conflist
+%config(noreplace) %{_sysconfdir}/containers/libpod.conf
+%dir %{_datadir}/containers
+%{_datadir}/containers/libpod.conf
 # Completion
 %config %{_sysconfdir}/bash_completion.d/podman