Merge branch 'master' into f17

This commit is contained in:
Simone Caronni 2012-06-06 18:19:05 +02:00
commit 65d54149cf
2 changed files with 1176 additions and 1 deletions

1170
bacula-5.2.7-xattr.patch Normal file

File diff suppressed because it is too large Load Diff

View File

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