diff --git a/.gitignore b/.gitignore index d1cccec..5fab640 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ bacula-docs-5.0.3.tar.bz2 /bacula-docs-5.2.3.tar.bz2 /bacula-5.2.4.tar.gz +/bacula-5.2.5.tar.gz diff --git a/README.Fedora b/README.Fedora index 6e5f3a1..fdd6e93 100644 --- a/README.Fedora +++ b/README.Fedora @@ -16,24 +16,39 @@ Bacula director supports different databases backends, if you want to switch away from the default PostgreSQL one you need to change the "libbaccats" (the 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: -# alternatives --display libbaccats-5.2.4.so -libbaccats-5.2.4.so - status is auto. - link currently points to /usr/lib64/libbaccats-postgresql-5.2.4.so -/usr/lib64/libbaccats-mysql-5.2.4.so - priority 50 - slave libbaccats.so: /usr/lib64/libbaccats-5.2.4.so -/usr/lib64/libbaccats-sqlite3-5.2.4.so - priority 40 - slave libbaccats.so: /usr/lib64/libbaccats-5.2.4.so -/usr/lib64/libbaccats-postgresql-5.2.4.so - priority 60 - slave libbaccats.so: /usr/lib64/libbaccats-5.2.4.so -Current `best' version is /usr/lib64/libbaccats-postgresql-5.2.4.so. +# alternatives --display libbaccats.so +libbaccats.so - status is manual. + link currently points to /usr/lib64/libbaccats-postgresql-5.2.5.so +/usr/lib64/libbaccats-mysql-5.2.5.so - priority 50 + slave libbaccats-5.2.5.so: /usr/lib64/libbaccats-mysql-5.2.5.so +/usr/lib64/libbaccats-sqlite3-5.2.5.so - priority 40 + slave libbaccats-5.2.5.so: /usr/lib64/libbaccats-sqlite3-5.2.5.so +/usr/lib64/libbaccats-postgresql-5.2.5.so - priority 60 + slave libbaccats-5.2.5.so: /usr/lib64/libbaccats-postgresql-5.2.5.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: -# 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 diff --git a/bacula.spec b/bacula.spec index 40ff3ee..8dcd959 100644 --- a/bacula.spec +++ b/bacula.spec @@ -2,8 +2,8 @@ %global username bacula Name: bacula -Version: 5.2.4 -Release: 4%{?dist} +Version: 5.2.5 +Release: 1%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: GPLv2 with exceptions @@ -418,7 +418,7 @@ chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.* # Install headers %{__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 %{__install} -m 644 $dir/*.h %{buildroot}%{_includedir}/bacula/$dir done @@ -429,20 +429,20 @@ rm -rf %{buildroot} %post libs -/usr/sbin/alternatives --install %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-mysql-%{version}.so 50 \ - --slave %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-%{version}.so -/usr/sbin/alternatives --install %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-sqlite3-%{version}.so 40 \ - --slave %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-%{version}.so -/usr/sbin/alternatives --install %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-postgresql-%{version}.so 60 \ - --slave %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-%{version}.so +/usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-mysql-%{version}.so 50 \ + --slave %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-mysql-%{version}.so +/usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-sqlite3-%{version}.so 40 \ + --slave %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-sqlite3-%{version}.so +/usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-postgresql-%{version}.so 60 \ + --slave %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-postgresql-%{version}.so /sbin/ldconfig %preun libs if [ "$1" = 0 ]; then - /usr/sbin/alternatives --remove libbaccats-%{version}.so %{_libdir}/libbaccats-mysql-%{version}.so - /usr/sbin/alternatives --remove libbaccats-%{version}.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-mysql-%{version}.so + /usr/sbin/alternatives --remove libbaccats.so %{_libdir}/libbaccats-sqlite3-%{version}.so + /usr/sbin/alternatives --remove libbaccats.so %{_libdir}/libbaccats-postgresql-%{version}.so fi /sbin/ldconfig exit 0 @@ -788,6 +788,11 @@ fi %changelog +* Thu Jan 26 2012 Simone Caronni - 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 - 5.2.4-4 - Remove old BuildRequires for bacula-docs. diff --git a/sources b/sources index 5b97690..98e70c7 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -43e41c3f88e7ba86d0dd248935ce2f00 bacula-5.2.3.tar.gz -be132861c6d576dce9fa22a40250b416 bacula-5.2.4.tar.gz +89bd0ecf7ce0afbb222f47a01fa9a370 bacula-5.2.5.tar.gz