From a55cd362939cf9d1deb2e3ec343c14a95bf93c6b Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Jun 06 2012 17:22:23 +0000
Subject: Merge branch 'master' into f17


---

diff --git a/bacula.spec b/bacula.spec
index c2f3aea..410b8a2 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -466,20 +466,17 @@ exit 0
 
 
 %post libs-sql
-/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
+/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-postgresql.so 60
 /sbin/ldconfig
 
 
 %preun libs-sql
 if [ "$1" = 0 ]; then
-        /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
+        /usr/sbin/alternatives --remove libbaccats.so %{_libdir}/libbaccats-mysql.so
+        /usr/sbin/alternatives --remove libbaccats.so %{_libdir}/libbaccats-sqlite3.so
+        /usr/sbin/alternatives --remove libbaccats.so %{_libdir}/libbaccats-postgresql.so
 fi
 
 
@@ -833,6 +830,8 @@ fi
 %changelog
 * Wed Jun 06 2012 Simone Caronni <negativo17@gmail.com> - 5.2.7-3
 - Final xattr patch from upstream for bz#819158.
+- Switch alternatives to point to the unversioned system libraries.
+  Pointed out by the closely related bug #829219.
 
 * Mon Jun 04 2012 Simone Caronni <negativo17@gmail.com> - 5.2.7-2
 - Remove python-devel test leftover.