[bld] Updates to how Koji jobs are prepared and submitted

The spec file no longer contains the external changelog, so update
that.  The spec file also performs a GPG verify and brings in the .asc
file for the source archive.

Signed-off-by: David Cantrell <[email protected]>

Author: dcantrell

.copr/Makefile

@@ -31,9 +31,12 @@ PKG := $(shell grep ^Name: "$(SPEC_TEMPLATE)" | awk '{ print $$2; }')
 VER := $(shell grep 'version :' $(topdir)/meson.build | grep -E "'[0-9]+\.[0-9]+'" | cut -d "'" -f 2)
 
 ifeq ($(BUILDTYPE),copr)
-GITDATE = $(shell date +'%Y%m%d%H%M')
-GITHASH = $(shell git rev-parse --short HEAD)
+GITDATE          = $(shell date +'%Y%m%d%H%M')
+GITHASH          = $(shell git rev-parse --short HEAD)
 TARBALL_BASENAME = $(PKG)-$(VER)-$(GITDATE)git$(GITHASH)
+TAG              = HEAD
+else
+TAG              = $(shell git tag -l | tail -n 1)
 endif
 
 ifeq ($(BUILDTYPE),release)
@@ -43,6 +46,7 @@ endif
 srpm:
 	$(topdir)/.copr/instpkgs.sh $(SPEC_TEMPLATE)
 	sed -e 's|%%VERSION%%|$(VER)|g' < "$(SPEC_TEMPLATE)" > "$(SPEC)"
+	sed -i -e 's|%%GPGKEYRING%%|gpgkey-$(GPGKEY).gpg|g' "$(SPEC)"
 ifeq ($(BUILDTYPE),copr)
 	sed -i -e '/^Release:/ s/1[^%]*/0.1.$(GITDATE)git$(GITHASH)/' "$(SPEC)"
 	sed -i -e 's|^Source0:.*$$|Source0: $(TARBALL_BASENAME).tar.xz|g' "$(SPEC)"
@@ -53,11 +57,14 @@ ifeq ($(BUILDTYPE),copr)
 	echo "* $(RPMDATE) $(RPMAUTHOR) - $(VER)-$(GITDATE)git$(GITHASH)" >> "$(SPEC)"
 	echo "- Build rpminspect-$(VER)-$(GITDATE)git$(GITHASH) snapshot" >> "$(SPEC)"
 endif
+	rm -f "$(TARBALL_BASENAME)".tar.xz.asc
 	git archive \
 		--format=tar \
 		--output='$(topdir)/$(TARBALL_BASENAME).tar' \
-		--prefix='$(TARBALL_BASENAME)/' HEAD $(topdir)
+		--prefix='$(TARBALL_BASENAME)/' $(TAG) $(topdir)
 	xz -9f $(topdir)/$(TARBALL_BASENAME).tar
+	gpg --detach-sign --armor "$(TARBALL_BASENAME)".tar.xz
+	gpg --export -a $(GPGKEY) > gpgkey-$(GPGKEY).gpg
 	rpmbuild \
 		-bs --nodeps \
 		--define "_sourcedir $(topdir)" \

.gitignore

@@ -1,6 +1,7 @@
 _build/
 build
 changelog
+*.gpg
 *.ko
 *.ko.cmd
 *.mod

Makefile

@@ -39,8 +39,8 @@ TARGET_ARG = `arg="$(filter-out $@,$(MAKECMDGOALS))" && echo $${arg:-${1}}`
 PRIMARY_AUTHORS = [email protected]
 
 # full path to release tarball and detached signature
-# (this comes from a 'make release')
-RELEASED_TARBALL = $(topdir)/$(MESON_BUILD_DIR)/meson-dist/$(PROJECT_NAME)-$(PROJECT_VERSION).tar.xz
+# (this comes from a 'make srpm')
+RELEASED_TARBALL = $(PROJECT_NAME)-$(PROJECT_VERSION).tar.xz
 RELEASED_TARBALL_ASC = $(RELEASED_TARBALL).asc
 
 all: setup
@@ -102,16 +102,22 @@ new-release:
 release:
 	$(topdir)/utils/release.sh -t -p
 
+# Generates content for CHANGES.md from previous tag to HEAD
 announce:
+	@$(topdir)/utils/mkannounce.sh
+
+# Generates changes between the two most recent stable releases,
+# excluding HEAD
+stable-announce:
 	@$(topdir)/utils/mkannounce.sh --stable
 
 koji: srpm
 	@if [ ! -f $(RELEASED_TARBALL) ]; then \
-		echo "*** Missing $(RELEASED_TARBALL), be sure to have run 'make release'" >&2 ; \
+		echo "*** Missing $(RELEASED_TARBALL), be sure to have run 'make srpm'" >&2 ; \
 		exit 1 ; \
 	fi
 	@if [ ! -f $(RELEASED_TARBALL_ASC) ]; then \
-		echo "*** Missing $(RELEASED_TARBALL_ASC), be sure to have run 'make release'" >&2 ; \
+		echo "*** Missing $(RELEASED_TARBALL_ASC), be sure to have run 'make srpm'" >&2 ; \
 		exit 1 ; \
 	fi
 	$(topdir)/utils/submit-koji-builds.sh $(RELEASED_TARBALL) $(RELEASED_TARBALL_ASC) $$(basename $(topdir))
@@ -177,7 +183,7 @@ help:
 	@echo "    make new-release     # bumps version number, tags, and pushes"
 	@echo
 	@echo "Generate SRPM of the latest release and do all Koji builds:"
-	@echo "    env BRANCHES=\"master f31 f32 f33 epel7 epel8\" make koji"
+	@echo "    env BRANCHES=\"rawhide f31 f32 f33 epel7 epel8\" make koji"
 	@echo "NOTE: You must set the BRANCHES environment variable for the koji target"
 	@echo "otherwise it will just build for the master branch."
 

rpminspect.spec.in

@@ -61,7 +61,7 @@ Recommends:     xhtml1-dtds
 Recommends:     html401-dtds
 %endif
 
-# Required to support things like %autorelease in spec files
+# Required to support things like %%autorelease in spec files
 %if 0%{?fedora} >= 33
 Recommends:     rpmautospec-rpm-macros
 %endif

utils/submit-koji-builds.sh

@@ -116,7 +116,6 @@ GIT_USERNAME="$(git config user.name)"
 GIT_USEREMAIL="$(git config user.email)"
 
 cd "${CWD}" || exit
-"${CWD}"/utils/mkrpmchangelog.sh > "${WRKDIR}"/newchangelog
 
 cd "${WRKDIR}" || exit
 ${VENDORPKG} co "${PROJECT}"
@@ -128,12 +127,13 @@ if [ -z "${BRANCHES}" ]; then
 fi
 
 for branch in ${BRANCHES} ; do
-    git clean -d -x -f
+    git clean -dxf
     git config user.name "${GIT_USERNAME}"
     git config user.email "${GIT_USEREMAIL}"
 
     # skip this branch if we lack build targets
     if ! ${VENDORKOJI} list-targets | grep -q "${branch}" >/dev/null 2>&1 ; then
+        echo "*** Skipping ${branch} because there is no longer a ${VENDORKOJI} target"
         continue
     fi
 
@@ -142,38 +142,36 @@ for branch in ${BRANCHES} ; do
     git pull
 
     # add the new source archive
-    ${VENDORPKG} new-sources "${TARBALL}"
-
-    # extract any changelog entries that appeared in the spec file
-    sed -n '/^%changelog/,/^%include\ \%{SOURCE1}/p' "${PROJECT}".spec | \
-        grep -vE '^(%changelog|%include)' | \
-        sed -e :a -e '/./,$!d;/^\n*$/{$d;N;};/\n$/ba' > cl
-    [ -s cl ] || rm -f cl
-
-    # update the rolling %changelog in dist-git
-    if [ -f changelog ]; then
-        if [ -f cl ]; then
-            echo >> changelog
-            cat changelog >> cl
-        else
-            mv changelog cl
-        fi
-
-        cp "${WRKDIR}"/newchangelog changelog
-        echo >> changelog
-        cat cl >> changelog
-        rm -f cl
-    else
-        cp "${WRKDIR}"/newchangelog changelog
+    ${VENDORPKG} new-sources "${TARBALL}" "${TARBALL_ASC}"
+
+    # save current changelog
+    pos=$(grep -n '^%changelog' "${PROJECT}".spec | cut -d ':' -f 1)
+    len=$(wc -l "${PROJECT}".spec | cut -d ' ' -f 1)
+    tail -n $((${len} - ${pos})) "${PROJECT}".spec > "${CWD}"/cl
+
+    # new changelog entry
+    VER="$(grep ^Version "${CWD}"/"${PROJECT}".spec | awk '{ print $2; }')"
+    REL="$(grep ^Release: "${CWD}"/"${PROJECT}".spec | awk '{ print $2; }' | cut -d '%' -f 1)"
+    echo "* $(date +"%a %b %d %Y") ${GIT_USERNAME} <${GIT_USEREMAIL}> - ${VER}-${REL}" > "${CWD}"/newcl
+    echo "- Upgrade to ${PROJECT}-${VER}" >> "${CWD}"/newcl
+
+    # new spec file
+    cat "${CWD}"/"${PROJECT}".spec "${CWD}"/newcl > "${PROJECT}".spec
+
+    if [ ! "$(stat -c %s "${CWD}"/cl)" = "0" ]; then
+        echo >> "${PROJECT}".spec
+        cat "${CWD}"/cl >> "${PROJECT}".spec
     fi
 
-    # copy in the new spec file
-    cat "${CWD}"/"${PROJECT}".spec > "${PROJECT}".spec
+    ( cd "${CWD}" ; rm -f newcl cl )
+
+    # copy in gpgkey
+    cp "${CWD}"/*.gpg .
 
     # commit changes
-    git add sources changelog "${PROJECT}".spec
-    ${VENDORPKG} ci -c -p -s
-    git clean -d -x -f
+    git add sources *.gpg "${PROJECT}".spec
+    ${VENDORPKG} ci -cps
+    git clean -dxf
 
     # build
     ${VENDORPKG} build --nowait