summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-11-12 17:07:22 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2018-11-12 17:09:01 -0500
commite2013b4ff4f349ec8109149ae9f07ad90eb84bbb (patch)
tree112016456e42a1d2da54d230b8d0e829eab57f47
parent7965716c74ef249e14f66702cff66baf759f6d68 (diff)
downloadpodman-e2013b4ff4f349ec8109149ae9f07ad90eb84bbb.tar.gz
podman-e2013b4ff4f349ec8109149ae9f07ad90eb84bbb.tar.bz2
podman-e2013b4ff4f349ec8109149ae9f07ad90eb84bbb.zip
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 <dwalsh@redhat.com>
-rw-r--r--contrib/spec/podman.spec.in10
1 files changed, 4 insertions, 6 deletions
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