From 69a741817b2697fd408a8b44b6331cf07c3511ec Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 7 Aug 2018 11:57:35 -0500 Subject: Test regressions against the RPM spec file We need to make sure we dont break the RPM spec files week-to-week. If we do, the packagers need to have a place to look at what changes are needed to the SPEC so they can pull the changes into the distributions. Signed-off-by: baude Closes: #1230 Approved by: rhatdan --- contrib/spec/podman.spec.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'contrib/spec/podman.spec.in') diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index e70bdcaec..9f1c4d011 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,6 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Patch0: makefile.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 @@ -364,7 +363,7 @@ providing packages with %{import_path} prefix. %endif %prep -%autosetup -Sgit -n %{repo}-%{commit0} +%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 @@ -476,8 +475,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/* %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf -%{_unitdir}/io.%{project}.%{name}.service -%{_unitdir}/io.%{project}.%{name}.socket +%{_unitdir}/io.podman.service +%{_unitdir}/io.podman.socket %{_usr}/lib/tmpfiles.d/%{name}.conf %if %{with varlink} -- cgit v1.2.3-54-g00ecf