[cygport - the Cygwin packaging tool] branch master, updated. 0.35.1

[Jon TURNEY]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=6d0200bc2b0cce8b3535328ed01229e45bc10069

commit 6d0200bc2b0cce8b3535328ed01229e45bc10069
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue May 24 12:38:45 2022 +0100

    Bump version to 0.35.1

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=76bca73aa3743975b6c10386b693e1b7298fa3ff

commit 76bca73aa3743975b6c10386b693e1b7298fa3ff
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon May 23 17:59:23 2022 +0100

    Fix 'test:' missing from srcpkg hint for 'all-test'
    
    Fix 'test:' label missing from srcpkg hint for 'all-test' and
    'package-test' commands.
    
    Regressed in 0dac514e, which moved source package hint creation into
    __pkg_srcpkg().

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=7c7439273e097b2d11c5ec8073c5c3449b11ca8a

commit 7c7439273e097b2d11c5ec8073c5c3449b11ca8a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue May 3 10:48:13 2022 +0100

    CI: Add manual trigger for runs


Diff:
---
 .github/workflows/cygwin.yml |  1 +
 NEWS                         |  3 +++
 bin/cygport.in               | 11 +++++++----
 cygport.spec                 |  2 +-
 data/sample.cygport          |  2 +-
 lib/pkg_pkg.cygpart          |  1 +
 meson.build                  |  2 +-
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index be1c9c3..9158dff 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -5,6 +5,7 @@ on:
     - master
     - 'cygport-*'
     - 'topic/**'
+  workflow_dispatch:
 
 env:
   CASE_INSENSITIVE: 1
diff --git a/NEWS b/NEWS
index a15f8e8..68e8525 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.35.1:
+	* Fixed regression causing missing test: label in srcpkg hint
+
 0.35.0:
 	* Don't ignore errors from 'make test'
 	* Add subcommand 'vars'
diff --git a/bin/cygport.in b/bin/cygport.in
index 81dd166..e2d7fac 100755
--- a/bin/cygport.in
+++ b/bin/cygport.in
@@ -638,13 +638,16 @@ do
 		package|pkg)
 			__stage "Packaging${_pkg_tag:+ ${_pkg_tag%:} release}";
 			__log_init ${pkglog};
-			(__pkg_binpkg && __pkg_pkgcheck && __pkg_srcpkg && __pkg_dist ${_pkg_tag}) 2>&1 | tee -a ${pkglog};
+			(__pkg_binpkg && __pkg_pkgcheck && __pkg_srcpkg ${_pkg_tag} && __pkg_dist ${_pkg_tag}) 2>&1 | tee -a ${pkglog};
 			_status=${PIPESTATUS[0]};
 			;;
+		srcpackage-test|srcpkg-test)
+			_pkg_tag="test:"
+			;&
 		srcpackage|srcpkg)
-			__stage Packaging Source;
+			__stage "Packaging${_pkg_tag:+ ${_pkg_tag%:} source}";
 			__log_init ${pkglog};
-			(__pkg_srcpkg) 2>&1 | tee -a ${pkglog};
+			(__pkg_srcpkg ${_pkg_tag}) 2>&1 | tee -a ${pkglog};
 			_status=${PIPESTATUS[0]};
 			;;
 		diff|mkdiff|mkpatch)
@@ -685,7 +688,7 @@ do
 			__stage Installing && (__prepinstalldirs && src_install && __src_postinst) 2>&1 | tee -a ${installlog} && \
 			test ${PIPESTATUS[0]} -eq 0 && \
 			__log_init ${pkglog} && \
-			__stage Packaging && (__pkg_binpkg && __pkg_pkgcheck && __pkg_srcpkg && __pkg_dist ${_pkg_tag}) 2>&1 | tee -a ${pkglog} && \
+			__stage Packaging && (__pkg_binpkg && __pkg_pkgcheck && __pkg_srcpkg ${_pkg_tag} && __pkg_dist ${_pkg_tag}) 2>&1 | tee -a ${pkglog} && \
 			test ${PIPESTATUS[0]} -eq 0
 			_status=$?;
 			;;
diff --git a/cygport.spec b/cygport.spec
index 1e36003..13613aa 100644
--- a/cygport.spec
+++ b/cygport.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           cygport
-Version:        0.35.0
+Version:        0.35.1
 Release:        1%{?dist}
 Summary:        Cygwin package building tool
 
diff --git a/data/sample.cygport b/data/sample.cygport
index ed03c32..da5e627 100644
--- a/data/sample.cygport
+++ b/data/sample.cygport
@@ -1,7 +1,7 @@
 inherit meson
 
 NAME="cygport"
-VERSION=0.35.0
+VERSION=0.35.1
 RELEASE=1
 CATEGORY="Devel"
 SUMMARY="Cygwin source packaging tool"
diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index b4c5c6f..db998f0 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -461,6 +461,7 @@ __gpg_sign() {
 
 __pkg_srcpkg() {
 	local src;
+	local pkg_tag=${1};
 
 	mkdir -p ${spkgdir};
 	rm -fr ${spkgdir}/*;
diff --git a/meson.build b/meson.build
index f085911..6ebf3b5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('cygport',
-        version: '0.35.0')
+        version: '0.35.1')
 
 bindir = join_paths(get_option('prefix'), get_option('bindir'))
 datadir = join_paths(get_option('prefix'), get_option('datadir'))