From 5f3a4a83e3226b2b18cc3525f2ca6b26dc62838c Mon Sep 17 00:00:00 2001 From: duli Date: Thu, 3 Oct 2024 16:59:36 +0800 Subject: [PATCH] fix: Makefile and create copr_script.sh --- .copr/Makefile | 22 +++------------------- .copr/copr_script.sh | 33 +++++++++++++++++++++++++++++++++ .copr/vendor-tarball.sh | 2 +- 3 files changed, 37 insertions(+), 20 deletions(-) create mode 100755 .copr/copr_script.sh diff --git a/.copr/Makefile b/.copr/Makefile index a5ab84fb..c0e09709 100644 --- a/.copr/Makefile +++ b/.copr/Makefile @@ -1,19 +1,3 @@ -src := $(shell pwd)/.copr -tag= - -srpm: dep - pushd $(src) - $(eval tag=$(shell git tag -l 'v*' --sort=-v:refname | head -n 1)) - @echo $(tag) - spectool -g artalk.spec - ./vendor-tarball.sh $(tag) - git stash # make sure workspace is empty. - cp changelog artalk.spec ../ - git add ../changelog ../artalk.spec && git commit -m "for rpmautospec [skip changelog]" - rpmautospec process-distgit ../artalk.spec artalk.spec - git stash pop # pop it! - rpkg srpm --spec artalk.spec --outdir=$(outdir) - popd - -dep: - dnf -y install git rpmdevtools golang rpmautospec rpkg +srpm: + # dnf -y install git rpmdevtools golang rpmautospec rpkg + .copr/copr_script.sh $(outdir) diff --git a/.copr/copr_script.sh b/.copr/copr_script.sh new file mode 100755 index 00000000..c6823fe9 --- /dev/null +++ b/.copr/copr_script.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env sh + +set -euo pipefail + +outdir=$1 +echo "Outdir: $outdir" + +tag=$(git tag -l 'v*' --sort=-v:refname | head -n 1) +echo "Using tag: $tag" + +pushd .copr + +# Download source +spectool -g artalk.spec + +rm -rf "artalk-${tag#v}-vendored.tar.gz" +./vendor-tarball.sh $tag + +# Parse %autorelease and %autochangelog +git stash +cp changelog artalk.spec ../ +git add ../changelog ../artalk.spec +git commit -m "for rpmautospec [skip changelog]" +rpmautospec process-distgit ../artalk.spec artalk.spec +if git stash list | grep -q 'stash@'; then + git stash pop +fi + +# Generate srpm +mkdir -p $outdir +rpkg srpm --spec artalk.spec --outdir=$outdir + +popd diff --git a/.copr/vendor-tarball.sh b/.copr/vendor-tarball.sh index 39d9e5ff..41bdc2d7 100755 --- a/.copr/vendor-tarball.sh +++ b/.copr/vendor-tarball.sh @@ -36,7 +36,7 @@ TARFLAGS=( --mode=go+u,go-w ) -tar "${TARFLAGS[@]}" -czf "$name-$version-vendored.tar.gz" "$name-$version" +tar "${TARFLAGS[@]}" -czvf "$name-$version-vendored.tar.gz" "$name-$version" # Clean up the temporary directory rm -rf "$name-$version"