[amanda/f15] fix for amrecover reports "Too many directories matching" (#751446)

[Lukáš Nykrýn]

commit 3a248ab77661f492c791702e77f7ed75d9478321
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Tue Nov 8 10:55:27 2011 +0100

    fix for amrecover reports "Too many directories matching" (#751446)

 amanda-3.2.3-list_dir.patch |   14 ++++++++++++++
 amanda.spec                 |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/amanda-3.2.3-list_dir.patch b/amanda-3.2.3-list_dir.patch
new file mode 100644
index 0000000..c7d9617
--- /dev/null
+++ b/amanda-3.2.3-list_dir.patch
@@ -0,0 +1,14 @@
+diff --git a/server-src/list_dir.c b/server-src/list_dir.c
+--- a/server-src/list_dir.c
++++ b/server-src/list_dir.c
+@@ -89,8 +89,8 @@ add_dir_list_item(
+ 	return 0; /* added */
+     }
+ 
+-    if (strcmp(path,dir_last->path) == 0 &&
+-	dir_last->dump == dump) {
++    if (strcmp(path, "/") != 0 &&
++	strcmp(path, dir_last->path) == 0) {
+ 	return 0; /* found */
+     }
+ 
diff --git a/amanda.spec b/amanda.spec
index 682784b..83dfb47 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -8,7 +8,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -19,6 +19,8 @@ Patch2: amanda-3.1.1-xattrs.patch
 Patch3: amanda-3.1.1-tcpport.patch
 Patch5: amanda-3.1.1-bsd.patch
 Patch6: amanda-3.2.0-config-dir.patch
+Patch7: amanda-3.2.3-list_dir.patch
+
 License: BSD and GPLv3+ and GPLv2+ and GPLv2
 Group: Applications/System
 URL: http://www.amanda.org
@@ -84,6 +86,7 @@ server also needs to have the amanda-client package installed.
 %patch3 -p1 -b .tcpport
 %patch5 -p1 -b .bsd
 %patch6 -p1 -b .config
+%patch7 -p1 -b .listdir
 ./autogen
 
 %build
@@ -427,6 +430,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Thu Nov 08 2011 Lukáš Nykrýn <lnykryn at redhat.com> - 3.2.3-2
+- fix #751446 - amrecover reports "Too many directories matching"
+
 * Wed May 11 2011 Jan Görig <jgorig at redhat.com> - 3.2.3-1
 - upgrade to new upstream bugfix release
 - removed merged patch amanda-3.2.2-krb5-libs.patch