Update to 5.2.5 and add the final stab in the heart of the libbaccats problem

This commit is contained in:
Simone Caronni 2012-01-26 12:31:57 +01:00
parent 420ad7d48b
commit f5b13930ab
4 changed files with 46 additions and 26 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ bacula-docs-5.0.3.tar.bz2
/bacula-docs-5.2.3.tar.bz2 /bacula-docs-5.2.3.tar.bz2
/bacula-5.2.4.tar.gz /bacula-5.2.4.tar.gz
/bacula-5.2.5.tar.gz

View File

@ -16,24 +16,39 @@
Bacula director supports different databases backends, if you want to switch Bacula director supports different databases backends, if you want to switch
away from the default PostgreSQL one you need to change the "libbaccats" (the away from the default PostgreSQL one you need to change the "libbaccats" (the
catalogue library) symlink to the real library. The following examples use catalogue library) symlink to the real library. The following examples use
version 5.2.4, substitute it with the version you have installed. version 5.2.5, substitute it with the version you have installed.
Show the current database backend: Show the current database backend:
# alternatives --display libbaccats-5.2.4.so # alternatives --display libbaccats.so
libbaccats-5.2.4.so - status is auto. libbaccats.so - status is manual.
link currently points to /usr/lib64/libbaccats-postgresql-5.2.4.so link currently points to /usr/lib64/libbaccats-postgresql-5.2.5.so
/usr/lib64/libbaccats-mysql-5.2.4.so - priority 50 /usr/lib64/libbaccats-mysql-5.2.5.so - priority 50
slave libbaccats.so: /usr/lib64/libbaccats-5.2.4.so slave libbaccats-5.2.5.so: /usr/lib64/libbaccats-mysql-5.2.5.so
/usr/lib64/libbaccats-sqlite3-5.2.4.so - priority 40 /usr/lib64/libbaccats-sqlite3-5.2.5.so - priority 40
slave libbaccats.so: /usr/lib64/libbaccats-5.2.4.so slave libbaccats-5.2.5.so: /usr/lib64/libbaccats-sqlite3-5.2.5.so
/usr/lib64/libbaccats-postgresql-5.2.4.so - priority 60 /usr/lib64/libbaccats-postgresql-5.2.5.so - priority 60
slave libbaccats.so: /usr/lib64/libbaccats-5.2.4.so slave libbaccats-5.2.5.so: /usr/lib64/libbaccats-postgresql-5.2.5.so
Current `best' version is /usr/lib64/libbaccats-postgresql-5.2.4.so. Current `best' version is /usr/lib64/libbaccats-postgresql-5.2.5.so.
To change to a different backend (i.e. MySQL), issue the following command: To change to a different backend (i.e. MySQL), issue the following command:
# update-alternatives --set libbaccats-5.2.4.so /usr/lib64/libbaccats-mysql-5.2.4.so # alternatives --set libbaccats.so /usr/lib64/libbaccats-mysql-5.2.5.so
Or this one to view the various options:
# alternatives --config libbaccats.so
There are 3 programs which provide 'libbaccats.so'.
Selection Command
-----------------------------------------------
1 /usr/lib64/libbaccats-mysql-5.2.5.so
2 /usr/lib64/libbaccats-sqlite3-5.2.5.so
*+ 3 /usr/lib64/libbaccats-postgresql-5.2.5.so
Enter to keep the current selection[+], or type selection number: 1
======== Quick installation guide with the default PostgreSQL backend ======== Quick installation guide with the default PostgreSQL backend

View File

@ -2,8 +2,8 @@
%global username bacula %global username bacula
Name: bacula Name: bacula
Version: 5.2.4 Version: 5.2.5
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: GPLv2 with exceptions License: GPLv2 with exceptions
@ -418,7 +418,7 @@ chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
# Install headers # Install headers
%{__mkdir_p} %{buildroot}%{_includedir}/bacula %{__mkdir_p} %{buildroot}%{_includedir}/bacula
for dir in src src/cats src/console src/dird src/filed src/findlib src/lib src/plugins/sd src/plugins/fd src/stored; do for dir in src src/cats src/console src/dird src/filed src/findlib src/lib src/plugins/fd src/stored; do
%{__mkdir_p} %{buildroot}%{_includedir}/bacula/$dir %{__mkdir_p} %{buildroot}%{_includedir}/bacula/$dir
%{__install} -m 644 $dir/*.h %{buildroot}%{_includedir}/bacula/$dir %{__install} -m 644 $dir/*.h %{buildroot}%{_includedir}/bacula/$dir
done done
@ -429,20 +429,20 @@ rm -rf %{buildroot}
%post libs %post libs
/usr/sbin/alternatives --install %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-mysql-%{version}.so 50 \ /usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-mysql-%{version}.so 50 \
--slave %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-%{version}.so --slave %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-mysql-%{version}.so
/usr/sbin/alternatives --install %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-sqlite3-%{version}.so 40 \ /usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-sqlite3-%{version}.so 40 \
--slave %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-%{version}.so --slave %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-sqlite3-%{version}.so
/usr/sbin/alternatives --install %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-postgresql-%{version}.so 60 \ /usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-postgresql-%{version}.so 60 \
--slave %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-%{version}.so --slave %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-postgresql-%{version}.so
/sbin/ldconfig /sbin/ldconfig
%preun libs %preun libs
if [ "$1" = 0 ]; then if [ "$1" = 0 ]; then
/usr/sbin/alternatives --remove libbaccats-%{version}.so %{_libdir}/libbaccats-mysql-%{version}.so /usr/sbin/alternatives --remove libbaccats.so %{_libdir}/libbaccats-mysql-%{version}.so
/usr/sbin/alternatives --remove libbaccats-%{version}.so %{_libdir}/libbaccats-sqlite3-%{version}.so /usr/sbin/alternatives --remove libbaccats.so %{_libdir}/libbaccats-sqlite3-%{version}.so
/usr/sbin/alternatives --remove libbaccats-%{version}.so %{_libdir}/libbaccats-postgresql-%{version}.so /usr/sbin/alternatives --remove libbaccats.so %{_libdir}/libbaccats-postgresql-%{version}.so
fi fi
/sbin/ldconfig /sbin/ldconfig
exit 0 exit 0
@ -788,6 +788,11 @@ fi
%changelog %changelog
* Thu Jan 26 2012 Simone Caronni <negativo17@gmail.com> - 5.2.5-1
- Update to 5.2.5.
- Change the alternative library to the base shared object name
so the preference set is not lost when changing releases.
* Mon Jan 23 2012 Simone Caronni <negativo17@gmail.com> - 5.2.4-4 * Mon Jan 23 2012 Simone Caronni <negativo17@gmail.com> - 5.2.4-4
- Remove old BuildRequires for bacula-docs. - Remove old BuildRequires for bacula-docs.

View File

@ -1,2 +1 @@
43e41c3f88e7ba86d0dd248935ce2f00 bacula-5.2.3.tar.gz 89bd0ecf7ce0afbb222f47a01fa9a370 bacula-5.2.5.tar.gz
be132861c6d576dce9fa22a40250b416 bacula-5.2.4.tar.gz