rpms/bacula
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f17

Browse Source
This commit is contained in:
Simone Caronni 2012-06-11 11:16:53 +02:00
commit e0332d317b
2 changed files with 20 additions and 1174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1170
bacula-5.2.7-xattr.patch
View File

File diff suppressed because it is too large Load Diff

24
bacula.spec
View File

@ -2,8 +2,8 @@
%global username bacula %global username bacula
Name: bacula Name: bacula
Version: 5.2.7 Version: 5.2.8
Release: 4%{?dist} Release: 1%{?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
@ -33,7 +33,6 @@ 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
@ -292,7 +291,6 @@ 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
@ -474,6 +472,18 @@ exit 0
/usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-mysql.so 50 /usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-mysql.so 50
/usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-sqlite3.so 40 /usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-sqlite3.so 40
/usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-postgresql.so 60 /usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-postgresql.so 60
# Fix for automatic selection of backends during upgrades
if readlink /etc/alternatives/libbaccats.so | grep --silent mysql || \
readlink /etc/alternatives/bacula-dir | grep --silent mysql || \
readlink /etc/alternatives/bacula-sd | grep --silent mysql; then
/usr/sbin/alternatives --set libbaccats.so %{_libdir}/libbaccats-mysql.so
elif readlink /etc/alternatives/libbaccats.so | grep --silent sqlite || \
readlink /etc/alternatives/bacula-dir | grep --silent sqlite || \
readlink /etc/alternatives/bacula-sd | grep --silent sqlite; then
/usr/sbin/alternatives --set libbaccats.so %{_libdir}/libbaccats-sqlite3.so
else
/usr/sbin/alternatives --set libbaccats.so %{_libdir}/libbaccats-postgresql.so
fi
/sbin/ldconfig /sbin/ldconfig
@ -833,6 +843,12 @@ fi
%changelog %changelog
* Mon Jun 11 2012 Simone Caronni <negativo17@gmail.com> - 5.2.8-1
- Update to 5.2.8.
- Removed upstram xattr patch.
- Added database backend detection to bacula-libs-sql for upgrades from
<= 5.0.3-28-fc16 and 5.2.6-1.fc17.
* Fri Jun 08 2012 Simone Caronni <negativo17@gmail.com> - 5.2.7-4 * Fri Jun 08 2012 Simone Caronni <negativo17@gmail.com> - 5.2.7-4
- Make a note about mt-st and mtx (bz#829888). - Make a note about mt-st and mtx (bz#829888).
- Update README.Fedora with current information. - Update README.Fedora with current information.