[packages/rpm/db52: 20/21] Merge branch 'master' into db52

[baggins]

commit 4899c4ec94c7726a088486103d7c4399bab9d221
Merge: bf728d0 7ffaa76
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 23 08:13:45 2012 +0100

    Merge branch 'master' into db52
    
    Conflicts:
    	rpm-db5.2.patch
    	rpm.spec

 macros.local                         |  6 +++---
 macros.pld.in                        |  5 +++++
 rpm-5.4.9-fix-rpm_qa-pattern.patch   | 11 +++++++++++
 rpm-DB_CONFIG.patch                  | 13 +++++++++++++
 rpm-db_buffer_small.patch            |  8 ++++----
 rpm-dont-copy-descriptive-tags.patch | 31 +++++++++++++++++++++++++++++++
 rpm-epoch0.patch                     | 24 ------------------------
 rpm-macros.patch                     | 22 ++++++++++++++++++++++
 rpm.spec                             | 29 +++++++++++++++++++----------
 9 files changed, 108 insertions(+), 41 deletions(-)
---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/f777956720296dcb17678575a82af281a1b53e3b