summaryrefslogtreecommitdiff
path: root/macros.in
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2013-01-28 22:28:35 +0200
committerPanu Matilainen <pmatilai@redhat.com>2013-01-29 08:15:10 +0200
commitd16005305554c30c637428240c76d8292c2122d8 (patch)
tree78392fbc91f1442ea95ff44980d44e93feb0cc4e /macros.in
parentfd5e1c5e1919bb741bdede0e6e24ebc0e87f8297 (diff)
downloadrpm-d16005305554c30c637428240c76d8292c2122d8.tar.gz
rpm-d16005305554c30c637428240c76d8292c2122d8.tar.bz2
rpm-d16005305554c30c637428240c76d8292c2122d8.zip
Split __scm_author to separate name and email address macros
- At least git wants name and email separately, change __scm_author to combine the two instead. Related to RhBug:905002. (cherry picked from commit 1a21dc867dfbf48169782c6b8dbd0e0476e2bbbf)
Diffstat (limited to 'macros.in')
-rw-r--r--macros.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/macros.in b/macros.in
index dc4939ad1..1f27e2146 100644
--- a/macros.in
+++ b/macros.in
@@ -1036,7 +1036,9 @@ done \
# default to plain patch
%__scm patch
# meh, figure something saner
-%__scm_author rpm-build <rpm-build>
+%__scm_username rpm-build
+%__scm_usermail <rpm-build>
+%__scm_author %{__scm_username} %{__scm_usermail}
# Plain patch (-m is unused)
%__scm_setup_patch(q) %{nil}