diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-13 02:55:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 02:55:36 -0800 |
| commit | 900436e70f1a79dff6449fbd9997c4da715ddcc6 (patch) | |
| tree | 112016456e42a1d2da54d230b8d0e829eab57f47 | |
| parent | 7965716c74ef249e14f66702cff66baf759f6d68 (diff) | |
| parent | e2013b4ff4f349ec8109149ae9f07ad90eb84bbb (diff) | |
| download | podman-900436e70f1a79dff6449fbd9997c4da715ddcc6.tar.gz podman-900436e70f1a79dff6449fbd9997c4da715ddcc6.tar.bz2 podman-900436e70f1a79dff6449fbd9997c4da715ddcc6.zip | |
Merge pull request #1805 from rhatdan/rpm
Cleanup podman spec to not show git checkout is dirty
| -rw-r--r-- | contrib/spec/podman.spec.in | 10 |
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 |