[rpm] - update to 4.9.1.1

[Panu Matilainen]

commit 541e4803c32f608d8a856965233ae5f6933cc3bc
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Aug 2 13:37:01 2011 +0300

    - update to 4.9.1.1

 .gitignore                  |    1 +
 rpm-4.9.1-recurse-dir.patch |   43 -------------------------------------------
 rpm.spec                    |   10 +++++-----
 sources                     |    3 +--
 4 files changed, 7 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 75103aa..0ff1f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ rpm-4.8.1.tar.bz2
 /rpm-4.9.0-rc1.tar.bz2
 /rpm-4.9.0.tar.bz2
 /rpm-4.9.1.tar.bz2
+/rpm-4.9.1.1.tar.bz2
diff --git a/rpm.spec b/rpm.spec
index 0864776..e8f3f2e 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -11,7 +11,7 @@
 
 %define rpmhome /usr/lib/rpm
 
-%define rpmver 4.9.1
+%define rpmver 4.9.1.1
 %define srcver %{rpmver}%{?snapver:-%{snapver}}
 
 %define bdbname db4
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}2%{?dist}
+Release: %{?snapver:0.%{snapver}.}1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@@ -40,7 +40,6 @@ Patch3: rpm-4.8.0-no-man-dirs.patch
 Patch4: rpm-4.8.1-use-gpg2.patch
 
 # Patches already in upstream
-Patch200: rpm-4.9.1-recurse-dir.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -208,8 +207,6 @@ packages on a system.
 %patch3 -p1 -b .no-man-dirs
 %patch4 -p1 -b .use-gpg2
 
-%patch200 -p1 -b .recurse-dir
-
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 %patch303 -p1 -b .debuginfo-allnames
@@ -426,6 +423,9 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Tue Aug 02 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.1.1-1
+- update to 4.9.1.1
+
 * Tue Jul 19 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.1-2
 - fix recursion of directories with trailing slash in file list (#722474)
 
diff --git a/sources b/sources
index 30b3261..2f7582a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-9fb2bf03c697d719a9bfc72aafb723b9  rpm-4.9.0.tar.bz2
-6d1eb8fbdb1cd11ab90420998c096a72  rpm-4.9.1.tar.bz2
+529df3e2705d851e26a9d88d5bd2ddd3  rpm-4.9.1.1.tar.bz2