- dont-substitute-release.patch: mail: Don't include the release

number in User-Agent.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=95

dont-substitute-release.patch

@@ -0,0 +1,43 @@
+From: Jean Delvare <jdelvare@suse.de>
+Subject: mail: Don't include the release number in User-Agent
+Upstream: Submitted (2015-01-26)
+
+@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
+@@ -495,7 +495,7 @@ introduction="$(gen_tempfile)"
+ (
+ 	cat <<-EOF
+ 	Message-Id: <$(msgid)>
+-	User-Agent: quilt/@VERSION@-@RELEASE@
++	User-Agent: quilt/@VERSION@
+ 	Date: $(date --rfc-822)
+ 	From: ${opt_from:-$opt_sender}
+ 	To: $(IFS=,; echo "${opt_to[*]}")

quilt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 28 12:15:51 CET 2015 - jdelvare@suse.de
+
+- dont-substitute-release.patch: mail: Don't include the release
+  number in User-Agent.
+
 -------------------------------------------------------------------
 Wed Jan 28 11:40:19 CET 2015 - jdelvare@suse.de
 

quilt.spec

@@ -54,6 +54,7 @@ Patch12:        quilt-check-modified-series.patch
 Patch13:        quilt-check-modified-series-rearm.patch
 Patch14:        quilt-el-fix-tramp-support.patch
 Patch15:        quilt-el-fix-patch-select-completion.patch
+Patch16:        dont-substitute-release.patch
 Patch61:        hackweek-11-01-comment-update.patch
 Patch62:        hackweek-11-02-cleanups.patch
 Patch63:        hackweek-11-03-inspect-list-all-options.patch
@@ -104,6 +105,7 @@ http://www.zip.com.au/~akpm/linux/patches/.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
@@ -135,7 +137,7 @@ CFLAGS="%{optflags}" \
     --with-patch-wrapper \
     --with-patch=/usr/bin/patch \
     --with-rpmbuild=/usr/lib/rpm/rpmb
-make %{?_smp_mflags} RELEASE=%{release}
+make %{?_smp_mflags}
 # Compile quilt.el for faster emacs startup (bnc#617673)
 pushd lib
 emacs -batch -q --no-site -f batch-byte-compile quilt.el