diff options
| author | baude <bbaude@redhat.com> | 2018-08-07 11:57:35 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-07 20:23:53 +0000 |
| commit | 69a741817b2697fd408a8b44b6331cf07c3511ec (patch) | |
| tree | 1f399de5a99ed9f4e6e24edcce25330e0baa29c7 /contrib | |
| parent | 7d43e7c451d79c0e110bdb60a398ad083720c48b (diff) | |
| download | podman-69a741817b2697fd408a8b44b6331cf07c3511ec.tar.gz podman-69a741817b2697fd408a8b44b6331cf07c3511ec.tar.bz2 podman-69a741817b2697fd408a8b44b6331cf07c3511ec.zip | |
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 <bbaude@redhat.com>
Closes: #1230
Approved by: rhatdan
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/build_rpm.sh | 23 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 7 |
2 files changed, 26 insertions, 4 deletions
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh new file mode 100644 index 000000000..8bcd4b87e --- /dev/null +++ b/contrib/build_rpm.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -x +dnf -y install device-mapper-devel \ + git \ + glib2-devel \ + glibc-static \ + golang \ + golang-github-cpuguy83-go-md2man \ + gpgme-devel \ + libassuan-devel \ + libseccomp-devel \ + libselinux-devel \ + make \ + ostree-devel \ + golang-github-cpuguy83-go-md2man \ + rpm-build \ + btrfs-progs-devel \ + python3-devel \ + python3-varlink \ + go-compilers-golang-compiler + +make -f .copr/Makefile +rpmbuild --rebuild podman-*.src.rpm 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} |