[Quilt-dev] [PATCH] mail: Don't include the release number in User-Agent

[Jean Delvare]

@RELEASE@ is replaced with the package-level release number in two
places: the spec file, where it is legitimate, and the mail command's
User-Agent string, where I think it is not. The package release
number should not affect the contents of the package, otherwise it
makes it difficult to compare build results.

I have checked other MUA (Mutt, Thunderbird, Claws Mail) and they all
only include the version, not the release number in their User-Agent
string.

Drop the @RELEASE@ replacement rule to make sure we don't use it
accidentally anywhere in the future. The spec file has its own build
rule so it is not affected.
---
 Makefile.in   |    1 -
 quilt/mail.in |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

--- a/Makefile.in
+++ b/Makefile.in
@@ -264,7 +264,6 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
                -e 's:@PATCH''@:$(PATCH):g'                             \
                -e 's:@STAT_HARDLINK''@:$(STAT_HARDLINK):g'             \
                -e 's:@VERSION''@:$(VERSION):g'                         \
-               -e 's:@RELEASE''@:$(RELEASE):g'                         \
                -e 's:@ETCDIR''@:$(etcdir):g'                           \
                -e 's:@LOCALEDIR''@:$(localedir):g'                     \
                -e 's:@DOCSUBDIR''@:$(docdir):g'                        \
--- a/quilt/mail.in
+++ b/quilt/mail.in
@@ -491,7 +491,7 @@ introduction="$(gen_tempfile)"
 (
        cat <<-EOF
        Message-Id: <$(msgid)>
-       User-Agent: quilt/@address@hidden@RELEASE@
+       User-Agent: quilt/@VERSION@
        Date: $(date --rfc-822)
        From: ${opt_from:-$opt_sender}
        To: $(IFS=,; echo "${opt_to[*]}")

-- 
Jean Delvare
SUSE L3 Support