From a4adfe5e0c9de160866455c77b24342304fa3706 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 8 Nov 2018 14:08:59 -0500 Subject: Bump to v0.11.1 Signed-off-by: Matthew Heon --- contrib/spec/podman.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/spec') diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index c2d8fc59d..5289f89b6 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.10.2 +Version: 0.11.1 Release: #COMMITDATE#.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 -- cgit v1.2.3-54-g00ecf From acb974f6824fd4acbed88197abf0a2811d1dc61c Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 8 Nov 2018 14:09:03 -0500 Subject: Bump to v0.11.2-dev Signed-off-by: Matthew Heon --- contrib/spec/podman.spec.in | 2 +- version/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/spec') diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 5289f89b6..f6ebfa148 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.11.1 +Version: 0.11.2 Release: #COMMITDATE#.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 diff --git a/version/version.go b/version/version.go index 1c92c035f..01b9b7a8d 100644 --- a/version/version.go +++ b/version/version.go @@ -4,4 +4,4 @@ package version // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -const Version = "0.11.1" +const Version = "0.11.2-dev" -- cgit v1.2.3-54-g00ecf From e2013b4ff4f349ec8109149ae9f07ad90eb84bbb Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 12 Nov 2018 17:07:22 -0500 Subject: Cleanup podman spec to not show git checkout is dirty Currently we modify the git checkout which ends up showing that the checkout is dirty. This patch sets the PYTHON_VERSION so that python code will handle it correctly without having to modify the actual code. Signed-off-by: Daniel J Walsh --- contrib/spec/podman.spec.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'contrib/spec') diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index f6ebfa148..3192cbfed 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -378,10 +378,6 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{repo}-%{shortcommit0} -sed -i '/\/bin\/env/d' completions/bash/%{name} -sed -i 's/0.0.0/%{version}/' contrib/python/%{name}/setup.py -sed -i 's/0.0.0/%{version}/' contrib/python/py%{name}/setup.py -mv pkg/hooks/README.md pkg/hooks/README-hooks.md # untar cri-o tar zxf %{SOURCE1} @@ -416,15 +412,17 @@ popd %install install -dp %{buildroot}%{_unitdir} -%{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ install.man \ install.cni \ install.systemd \ install.completions +mv pkg/hooks/README.md pkg/hooks/README-hooks.md + %if %{with varlink} -%{__make} DESTDIR=%{buildroot} install.python +PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} install.python %endif # varlink # install libpod.conf -- cgit v1.2.3-54-g00ecf