diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/build_rpm.sh | 29 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 3 |
2 files changed, 19 insertions, 13 deletions
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh index 088d8b7a5..b64973f0d 100755 --- a/contrib/build_rpm.sh +++ b/contrib/build_rpm.sh @@ -30,22 +30,26 @@ declare -a PKGS=(device-mapper-devel \ ) if [[ $pkg_manager == *dnf ]]; then + # We need to enable PowerTools if we want to get + # install all the pkgs we define in PKGS + sudo dnf config-manager --set-enabled PowerTools + PKGS+=(python3-devel \ python3-varlink \ ) - # btrfs-progs-devel is not available in CentOS/RHEL-8 - if ! grep -i -q 'Red Hat\|CentOS' /etc/redhat-release; then - PKGS+=(btrfs-progs-devel) - fi - # disable doc until go-md2man rpm becomes available - # disable debug to avoid error: Empty %files file ~/rpmbuild/BUILD/libpod-.../debugsourcefiles.list - export extra_arg="--without doc --without debug" -else - if ! grep -i -q 'Red Hat\|CentOS' /etc/redhat-release; then - PKGS+=(golang-github-cpuguy83-go-md2man) - fi fi +# btrfs-progs-devel is not available in CentOS/RHEL-8 +if ! (grep -i 'Red Hat\|CentOS' /etc/redhat-release | grep " 8" ); then + PKGS+=(golang-github-cpuguy83-go-md2man \ + btrfs-progs-devel \ + ) +fi + +# disable doc until go-md2man rpm becomes available +# disable debug to avoid error: Empty %files file ~/rpmbuild/BUILD/libpod-.../debugsourcefiles.list +export extra_arg="--without doc --without debug" + echo ${PKGS[*]} sudo $pkg_manager install -y ${PKGS[*]} @@ -56,3 +60,6 @@ if [ -d ~/rpmbuild/BUILD ]; then fi rpmbuild --rebuild ${extra_arg:-} podman-*.src.rpm + +# clean up src.rpm as it's been built +sudo rm -f podman-*.src.rpm diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 9676a3fb4..63f569a51 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,7 @@ # People want conmon packaged with the copr rpm %global import_path_conmon github.com/containers/conmon %global git_conmon https://%{import_path_conmon} -%global commit_conmon 6f3572558b97bc60dd8f8c7f0807748e6ce2c440 +%global commit_conmon d532caebc788fafdd2a305b68cd1983b4039bea4 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman @@ -79,7 +79,6 @@ Requires: runc Requires: skopeo-containers Requires: containernetworking-plugins >= 0.6.0-3 Requires: iptables -Requires: oci-systemd-hook %if 0%{?rhel} <= 7 Requires: container-selinux %else |