[packages/rpm-build-macros: 2/2] Merge commit 'origin'

[gotar]

commit 0129db82834cb2c41ff1cff45813c61a6088ca08
Merge: cfd0538 d46b35f
Author: Tomasz Pala <gotar at pld-linux.org>
Date:   Wed Aug 24 02:38:09 2016 +0200

    Merge commit 'origin'

 rpm-build-macros.spec |  2 +-
 rpm.macros            | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)
---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/0129db82834cb2c41ff1cff45813c61a6088ca08