diff --git a/.packit.yaml b/.packit.yaml index 605dc55c892..16165681620 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -31,9 +31,6 @@ jobs: update_release: false dist_git_branches: - fedora-all - actions: - pre-sync: - - "bash rpm/update-spec-provides.sh" - job: koji_build trigger: commit diff --git a/rpm/buildah.spec b/rpm/buildah.spec index 4746f5a4493..d50c3650143 100644 --- a/rpm/buildah.spec +++ b/rpm/buildah.spec @@ -69,8 +69,6 @@ BuildRequires: libseccomp-devel %endif Requires: libseccomp >= 2.4.1-0 Suggests: cpp -# DO NOT DELETE BELOW LINE - used for updating downstream goimports -# vendored libraries %description The %{name} package provides a command line tool which can be used to diff --git a/rpm/update-spec-provides.sh b/rpm/update-spec-provides.sh deleted file mode 100644 index b5a30b239e7..00000000000 --- a/rpm/update-spec-provides.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# This script will update the goimports in the rpm spec for downstream fedora -# packaging, via the `propose-downstream` packit action. -# The goimports don't need to be present upstream. - -set -eox pipefail - -PACKAGE=buildah -# script is run from git root directory -SPEC_FILE=rpm/$PACKAGE.spec - -export GOPATH=~/go -GOPATHDIR=$GOPATH/src/github.com/containers/ -mkdir -p $GOPATHDIR -ln -sf $(pwd) $GOPATHDIR/. - -# Packit sandbox doesn't allow root -# Install golist by downloading and extracting rpm -# We could handle this in packit `sandcastle` upstream itself -# but that depends on golist existing in epel -# https://github.com/packit/sandcastle/pull/186 -dnf download golist -rpm2cpio golist-*.rpm | cpio -idmv - -sed -i '/Provides: bundled(golang.*/d' $SPEC_FILE - -GO_IMPORTS=$(./usr/bin/golist --imported --package-path github.com/containers/$PACKAGE --skip-self | sort -u | xargs -I{} echo "Provides: bundled(golang({}))") - -awk -v r="$GO_IMPORTS" '/^# vendored libraries/ {print; print r; next} 1' $SPEC_FILE > temp && mv temp $SPEC_FILE