[rpm: 8/8] Merge branch 'f15'

[Panu Matilainen]

commit d123f007fcaf824f899780ed3006dfd65f96c2ee
Merge: 3b3876d 789268d
Author: Panu Matilainen <Panu Matilainen pmatilai at redhat.com>
Date:   Fri Jul 15 14:39:03 2011 +0300

    Merge branch 'f15'

 .gitignore                            |    1 +
 rpm-4.9.0-debugedit-dwarf4.patch      |  130 ---------------------------------
 rpm-4.9.0-empty-changelog-crash.patch |   21 -----
 rpm-4.9.0-empty-prep-crash.patch      |   21 -----
 rpm-4.9.0-file-compat.patch           |   39 ----------
 rpm-4.9.0-fstate-deps.patch           |   51 -------------
 rpm-4.9.0-fstate-verify.patch         |   41 ----------
 rpm-4.9.0-macro-self-undefine.patch   |   35 ---------
 rpm-4.9.0-manifest-fix.patch          |   11 ---
 rpm-4.9.0-prefcolor-erase.patch       |   46 ------------
 rpm-4.9.0-rpmts-noref.patch           |   30 --------
 rpm-4.9.0-specquery-pkgs.patch        |   23 ------
 rpm-4.9.0-sticky-elf.patch            |   16 ----
 rpm.spec                              |   51 ++-----------
 sources                               |    1 +
 15 files changed, 11 insertions(+), 506 deletions(-)
---
diff --cc rpm.spec
index 7393fef,ee868f1..cdb8da9
--- a/rpm.spec
+++ b/rpm.spec
@@@ -460,9 -423,10 +423,13 @@@ exit 
  %doc COPYING doc/librpm/html/*
  
  %changelog
+ * Fri Jul 15 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.1-1
+ - update to 4.9.1 (http://rpm.org/wiki/Releases/4.9.1)
+ - drop no longer needed patches
+ 
 +* Thu Jun 16 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.0-10
 +- rebuild to fix a missing interpreter dependency due to bug #712251
 +
  * Fri Jun 10 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.0-9
  - fix crash if prep or changelog section in spec is empty (#706959)
  - fix crash on macro which undefines itself