Skip to content

Commit d035dd2

Browse files
committed
make-srpm.sh: Only generate spec when --generate-spec is used
This greatly simplifies integration with Packit.
1 parent 2c417d8 commit d035dd2

File tree

1 file changed

+21
-17
lines changed

1 file changed

+21
-17
lines changed

make-srpm.sh

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,29 @@ VER="`echo "$VER" | sed "s/-.*-/.$TIMESTAMP./"`"
4747

4848
BRANCH="`git rev-parse --abbrev-ref HEAD`"
4949
test -n "$BRANCH" || die "failed to get current branch name"
50-
test "main" = "${BRANCH}" || VER="${VER}.${BRANCH//-/_}"
50+
test "main" = "${BRANCH}" || VER="${VER}.${BRANCH//[\/-]/_}"
5151
test -z "`git diff HEAD`" || VER="${VER}.dirty"
5252

5353
NV="${PKG}-${VER}"
5454
printf "\n%s: preparing a release of \033[1;32m%s\033[0m\n\n" "$SELF" "$NV"
5555

56-
TMP="`mktemp -d`"
57-
trap "rm -rf '$TMP'" EXIT
58-
cd "$TMP" >/dev/null || die "mktemp failed"
56+
if [[ "$1" != "--generate-spec" ]]; then
57+
TMP="`mktemp -d`"
58+
trap "rm -rf '$TMP'" EXIT
59+
cd "$TMP" >/dev/null || die "mktemp failed"
5960

60-
# clone the repository
61-
git clone "$REPO" "$PKG" || die "git clone failed"
62-
cd "$PKG" || die "git clone failed"
63-
make distcheck || die "'make distcheck' has failed"
61+
# clone the repository
62+
git clone "$REPO" "$PKG" || die "git clone failed"
63+
cd "$PKG" || die "git clone failed"
64+
make distcheck || die "'make distcheck' has failed"
6465

65-
SRC_TAR="${NV}.tar"
66-
SRC="${SRC_TAR}.xz"
67-
git archive --prefix="$NV/" --format="tar" HEAD -- . > "$SRC_TAR" \
68-
|| die "failed to export sources"
66+
SRC_TAR="${NV}.tar"
67+
SRC="${SRC_TAR}.xz"
68+
git archive --prefix="$NV/" --format="tar" HEAD -- . > "$SRC_TAR" \
69+
|| die "failed to export sources"
6970

70-
xz -c "$SRC_TAR" > "$SRC" || die "failed to compress sources"
71+
xz -c "$SRC_TAR" > "$SRC" || die "failed to compress sources"
72+
fi
7173

7274
SPEC="./$PKG.spec"
7375
cat > "$SPEC" << EOF
@@ -211,7 +213,9 @@ ctest %{?_smp_mflags} --output-on-failure
211213
%endif
212214
EOF
213215

214-
rpmbuild -bs "$SPEC" \
215-
--define "_sourcedir ." \
216-
--define "_specdir ." \
217-
--define "_srcrpmdir $DST"
216+
if [[ "$1" != "--generate-spec" ]]; then
217+
rpmbuild -bs "$SPEC" \
218+
--define "_sourcedir ." \
219+
--define "_specdir ." \
220+
--define "_srcrpmdir $DST"
221+
fi

0 commit comments

Comments
 (0)