Merge branch 'master' into f17

bacula.spec

@@ -3,7 +3,7 @@
 
 Name:                   bacula
 Version:                5.2.7
-Release:                2%{?dist}
+Release:                3%{?dist}
 Summary:                Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:                AGPLv3 with exceptions
@@ -32,6 +32,7 @@ Patch2:                 bacula-5.2.2-queryfile.patch
 Patch3:                 bacula-5.2.4-log-path.patch
 Patch4:                 bacula-5.0.3-sqlite-priv.patch
 Patch5:                 bacula-5.2.7-bat-build.patch
+Patch6:                 bacula-5.2.7-xattr.patch
 
 BuildRequires:          desktop-file-utils
 BuildRequires:          perl
@@ -290,6 +291,7 @@ Provides check_bacula support for Nagios.
 %patch3 -p1 -b .log-path
 %patch4 -p0 -b .priv
 %patch5 -p1 -b .bat-build
+%patch6 -p1 -b .xattr
 
 # Remove execution permissions from files we're packaging as docs later on
 find updatedb -type f | xargs chmod -x
@@ -829,6 +831,9 @@ fi
 
 
 %changelog
+* Wed Jun 06 2012 Simone Caronni <negativo17@gmail.com> - 5.2.7-3
+- Final xattr patch from upstream for bz#819158.
+
 * Mon Jun 04 2012 Simone Caronni <negativo17@gmail.com> - 5.2.7-2
 - Remove python-devel test leftover.
 - Updated bat build patch to add support for RHEL 6.