Merge branch 'build_version_upgrade' into 'master'

feat: introduce the `--version-upgrade` argument to `pkgctl build`

See merge request archlinux/devtools!261

contrib/completion/bash/devtools.in

@@ -150,6 +150,7 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
+	license
 	release
 	repo
 	search
@@ -196,6 +197,7 @@ _pkgctl_build_args=(
 	--pkgrel
 	--rebuild
 	--update-checksums
+	--version-upgrade
 	-e --edit
 
 	-r --release

contrib/completion/zsh/_devtools.in

@@ -59,6 +59,7 @@ _pkgctl_build_args=(
 	'--pkgrel=[Set pkgrel to a given value]:pkgrel:'
 	'--rebuild[Increment the pkgrel variable]'
 	'--update-checksums[Force computation and update of the checksums (disables auto-detection)]'
+	'--version-upgrade[Adjust the PKGBUILD to match the latest upstream version (via pkgctl version upgrade)]'
 	'(-e --edit)'{-e,--edit}'[Edit the PKGBUILD before building]'
 	'(-r --release)'{-r,--release}'[Automatically commit, tag and release after building]'
 	'(-m --message)'{-m,--message}"[Use the given <msg> as the commit message]:message:"

doc/man/pkgctl-build.1.asciidoc

@@ -84,6 +84,9 @@ PKGBUILD Options
 	are either automatically updated when upgrading a package using `--pkgver`
 	or should remain immutable during rebuilds.
 
+*--version-upgrade*::
+	Adjust the PKGBUILD to match the latest upstream version (via `pkgctl version upgrade`).
+
 *-e, --edit*::
 	Edit the PKGBUILD before building
 

src/commitpkg.in

@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done

src/lib/build/build.sh

@@ -67,6 +67,7 @@ pkgctl_build_usage() {
 		    --pkgrel=PKGREL      Set pkgrel to a given value
 		    --rebuild            Increment the current pkgrel variable
 		    --update-checksums   Force computation and update of the checksums (disables auto-detection)
+		    --version-upgrade    Adjust the PKGBUILD to match the latest upstream version (via pkgctl version upgrade)
 		    -e, --edit           Edit the PKGBUILD before building
 
 		RELEASE OPTIONS
@@ -116,6 +117,7 @@ pkgctl_build() {
 	fi
 
 	local UPDATE_CHECKSUMS=0
+	local VERSION_UPGRADE=0
 	local EDIT=0
 	local REBUILD=0
 	local OFFLOAD=0
@@ -187,6 +189,10 @@ pkgctl_build() {
 				UPDATE_CHECKSUMS=1
 				shift
 				;;
+			--version-upgrade)
+				VERSION_UPGRADE=1
+				shift
+				;;
 			--rebuild)
 				# shellcheck source=src/lib/util/git.sh
 				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
@@ -452,6 +458,13 @@ pkgctl_build() {
 			. ./PKGBUILD
 		fi
 
+		# update PKGBUILD to the latest upstream version
+		if (( VERSION_UPGRADE )); then
+			if ! $(pkgctl_version_upgrade); then
+				die
+			fi
+		fi
+
 		# execute build
 		for arch in "${BUILD_ARCH[@]}"; do
 			if [[ -n $arch ]]; then

src/lib/license/setup.sh

@@ -191,7 +191,9 @@ path = [
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
+    "*sysusers.conf",
     "*.tmpfiles",
+    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",