[bacula] Update spec and readme for 5.2.4

Wed Jan 18 16:34:16 UTC 2012

commit e95438fe75782e7060cbcbdc5d368a440af1025f
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jan 18 17:33:53 2012 +0100

    Update spec and readme for 5.2.4

 README.Fedora |   45 ++++++++++++++++++++++++---------------------
 bacula.spec   |   28 +++++++++++++++++-----------
 2 files changed, 41 insertions(+), 32 deletions(-)
---

diff --git a/README.Fedora b/README.Fedora
index 8f97efa..28e32c7 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -1,41 +1,44 @@
 ======== Features
 
-- Standard components: director, storage, client, docs, bconsole.
-- Graphical components: bat, bacula-tray-monitor (where supported).
-- Nagios plugin.
+- Components: bat, bconsole, bacula-tray-monitor, director, storage daemon,
+  client, docs, Nagios plugin.
 - HTML/PDF docs.
 - File Daemon bpipe-fd plugin.
 - POSIX.1e capabilities for File Daemon.
 - Systemd for Fedora 15+.
-- GZIP/LZO compression (where supported).
+- LZO compression.
 - Static uid/gid of 133 (see "setup" package).
-- No usermode / fedora-usermgmt stuff in the console packages.
+- No usermode / fedora-usermgmt stuff in the packages.
 
 ======== PostgreSQL, MySQL and SQLite databases
 
 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.3, substitute it with the version you have installed.
+catalogue library) symlink to the real library. The following examples uses
+version 5.2.4, substitute them with you running version.
 
 Show the current database backend:
 
-# update-alternatives --display libbaccats-5.2.3.so
-libbaccats-5.2.3.so - status is auto.
- link currently points to /usr/lib64/libbaccats-postgresql-5.2.3.so
-/usr/lib64/libbaccats-mysql-5.2.3.so - priority 50
-/usr/lib64/libbaccats-sqlite3-5.2.3.so - priority 40
-/usr/lib64/libbaccats-postgresql-5.2.3.so - priority 60
-Current `best' version is /usr/lib64/libbaccats-postgresql-5.2.3.so.
+# 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.
 
 To change to a different backend (i.e. MySQL), issue the following command:
 
-# update-alternatives --set libbaccats-5.2.3.so /usr/lib64/libbaccats-mysql-5.2.3.so
+# update-alternatives --set libbaccats-5.2.4.so /usr/lib64/libbaccats-mysql-5.2.4.so
 
 ======== Quick installation guide with the default PostgreSQL backend
 
-Perform the following commands to install Bacula with its default configuration
-and all daemons and consoles in one server.
+Perform the following commands as root to install Bacula with its default
+configuration and all daemons and consoles in one server. Tune your commands
+accordingly.
 
 1) Install packages
 
@@ -48,10 +51,10 @@ and all daemons and consoles in one server.
 # systemctl enable postgresql.service
 # systemctl start postgresql.service
 # su - postgres
-$ cd /usr/libexec/bacula
-$ ./create_bacula_database
-$ ./make_bacula_tables
-$ ./grant_bacula_privileges
+# cd /usr/libexec/bacula
+# ./create_bacula_database
+# ./make_bacula_tables
+# ./grant_bacula_privileges
 
 3) Change passwords in /etc/bacula/*conf with something you like
 
diff --git a/bacula.spec b/bacula.spec
index 832885b..8a10b3b 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,8 +2,8 @@
 %global username bacula
 
 Name:			bacula
-Version:		5.2.3
-Release:		8%{?dist}
+Version:		5.2.4
+Release:		1%{?dist}
 Summary:		Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:		GPLv2 with exceptions
@@ -245,8 +245,8 @@ monitor your bacula server.
 
 
 %package devel
-Summary:                Bacula development files
-Group:                  Development/Libraries
+Summary:		Bacula development files
+Group:			Development/Libraries
 
 %description devel
 Bacula is a set of programs that allow you to manage the backup,
@@ -357,9 +357,9 @@ make install DESTDIR=%{buildroot}
 # Nagios plugin
 %{__install} -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
 
-# Catalogue dummy
+# Remove catalogue backend symlinks
+rm -f %{buildroot}%{_libdir}/libbaccats.so
 rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
-%{__install} -m 755 src/cats/.libs/libbaccats-%{version}.so %{buildroot}%{_libdir}/
 
 # Sample query file
 %{__install} -m 640 -D examples/sample-query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql
@@ -438,9 +438,12 @@ rm -rf %{buildroot}
 
 
 %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-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-sqlite3-%{version}.so 40
-/usr/sbin/alternatives --install %{_libdir}/libbaccats-%{version}.so libbaccats-%{version}.so %{_libdir}/libbaccats-postgresql-%{version}.so 60
+/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
 /sbin/ldconfig
 
 
@@ -451,6 +454,7 @@ if [ "$1" = 0 ]; then
 	/usr/sbin/alternatives --remove libbaccats-%{version}.so %{_libdir}/libbaccats-postgresql-%{version}.so
 fi
 /sbin/ldconfig
+exit 0
 
 
 %pre common
@@ -626,8 +630,6 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libbac-%{version}.so
 %{_libdir}/libbac.so
-%{_libdir}/libbaccats.so
-%attr(755,root,root) %ghost %{_libdir}/libbaccats-%{version}.so
 %{_libdir}/libbaccats-mysql-%{version}.so
 %{_libdir}/libbaccats-mysql.so
 %{_libdir}/libbaccats-postgresql-%{version}.so
@@ -795,6 +797,10 @@ fi
 
 
 %changelog
+* Wed Jan 18 2012 Simone Caronni <negativo17 at gmail.com> - 5.2.4-1
+- Update to 5.2.4, rework libbaccats installation as they have
+  fixed the soname library problem.
+
 * Sun Jan 12 2012 Simone Caronni <negativo17 at gmail.com> - 5.2.3-8
 - Fix tray monitor desktop file.
 
