[bacula/f15] Fix for rhbz#784471, add libbaccats.so alternative
Simone Caronni
slaanesh at fedoraproject.org
Wed Jan 25 08:19:52 UTC 2012
commit b36afda13f46f549941fbb9cf51f0adb7ffb8ccb
Author: Simone Caronni <negativo17 at gmail.com>
Date: Wed Jan 25 09:19:39 2012 +0100
Fix for rhbz#784471, add libbaccats.so alternative
bacula.spec | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 4c42375..fdfd058 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
Name: bacula
Version: 5.0.3
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: GPLv2 with exceptions
@@ -544,10 +544,11 @@ pushd bacula-sqlite
mv %{buildroot}%{_sbindir}/bscan %{buildroot}%{_sbindir}/bscan.sqlite
mv %{buildroot}%{_sbindir}/btape %{buildroot}%{_sbindir}/btape.sqlite
mv %{buildroot}%{_libdir}/libbacsql-%{version}.so %{buildroot}%{_libdir}/libbacsql-%{version}.so.sqlite
+ rm -f %{buildroot}%{_libdir}/libbacsql.so
for script in create_bacula_database drop_bacula_database drop_bacula_tables \
grant_bacula_privileges make_bacula_tables make_catalog_backup \
- update_bacula_tables; do
+ update_bacula_tables bacula_config; do
mv %{buildroot}%{_libexecdir}/bacula/${script} %{buildroot}%{_libexecdir}/bacula/${script}.sqlite
done
popd
@@ -560,10 +561,11 @@ pushd bacula-mysql
mv %{buildroot}%{_sbindir}/bscan %{buildroot}%{_sbindir}/bscan.mysql
mv %{buildroot}%{_sbindir}/btape %{buildroot}%{_sbindir}/btape.mysql
mv %{buildroot}%{_libdir}/libbacsql-%{version}.so %{buildroot}%{_libdir}/libbacsql-%{version}.so.mysql
+ rm -f %{buildroot}%{_libdir}/libbacsql.so
for script in create_bacula_database drop_bacula_database drop_bacula_tables \
grant_bacula_privileges make_bacula_tables make_catalog_backup \
- update_bacula_tables; do
+ update_bacula_tables bacula_config; do
mv %{buildroot}%{_libexecdir}/bacula/${script} %{buildroot}%{_libexecdir}/bacula/${script}.mysql
done
popd
@@ -576,10 +578,11 @@ pushd bacula-postgresql
mv %{buildroot}%{_sbindir}/bscan %{buildroot}%{_sbindir}/bscan.postgresql
mv %{buildroot}%{_sbindir}/btape %{buildroot}%{_sbindir}/btape.postgresql
mv %{buildroot}%{_libdir}/libbacsql-%{version}.so %{buildroot}%{_libdir}/libbacsql-%{version}.so.postgresql
+ rm -f %{buildroot}%{_libdir}/libbacsql.so
for script in create_bacula_database drop_bacula_database drop_bacula_tables \
grant_bacula_privileges make_bacula_tables make_catalog_backup \
- update_bacula_tables; do
+ update_bacula_tables bacula_config; do
mv %{buildroot}%{_libexecdir}/bacula/${script} %{buildroot}%{_libexecdir}/bacula/${script}.postgresql
done
popd
@@ -609,9 +612,9 @@ install -m 755 -D %{SOURCE8} %{buildroot}%{_unitdir}/bacula-dir.service
install -m 755 -D %{SOURCE9} %{buildroot}%{_unitdir}/bacula-sd.service
%else
# Initscripts
-install -m 755 -D %{SOURCE7} %{buildroot}%{_initrddir}/bacula-fd
-install -m 755 -D %{SOURCE8} %{buildroot}%{_initrddir}/bacula-dir
-install -m 755 -D %{SOURCE9} %{buildroot}%{_initrddir}/bacula-sd
+install -m 755 -D %{SOURCE4} %{buildroot}%{_initrddir}/bacula-fd
+install -m 755 -D %{SOURCE5} %{buildroot}%{_initrddir}/bacula-dir
+install -m 755 -D %{SOURCE6} %{buildroot}%{_initrddir}/bacula-sd
%endif
# Sysconfig
@@ -658,40 +661,43 @@ rm -rf %{buildroot}
/usr/sbin/alternatives --install /usr/sbin/bacula-dir bacula-dir /usr/sbin/bacula-dir.mysql 50 \
--slave /usr/sbin/dbcheck bacula-dbcheck /usr/sbin/dbcheck.mysql \
--slave %{_libdir}/libbacsql-%{version}.so libbacsql-%{version}.so %{_libdir}/libbacsql-%{version}.so.mysql \
+ --slave %{_libdir}/libbacsql.so libbacsql.so %{_libdir}/libbacsql-%{version}.so \
--slave /usr/libexec/bacula/create_bacula_database create_bacula_database /usr/libexec/bacula/create_bacula_database.mysql \
--slave /usr/libexec/bacula/drop_bacula_database drop_bacula_database /usr/libexec/bacula/drop_bacula_database.mysql \
--slave /usr/libexec/bacula/drop_bacula_tables drop_bacula_tables /usr/libexec/bacula/drop_bacula_tables.mysql \
--slave /usr/libexec/bacula/grant_bacula_privileges grant_bacula_privileges /usr/libexec/bacula/grant_bacula_privileges.mysql \
--slave /usr/libexec/bacula/make_bacula_tables make_bacula_tables /usr/libexec/bacula/make_bacula_tables.mysql \
--slave /usr/libexec/bacula/make_catalog_backup make_catalog_backup /usr/libexec/bacula/make_catalog_backup.mysql \
- --slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.mysql
-/sbin/ldconfig
+ --slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.mysql \
+ --slave /usr/libexec/bacula/bacula_config bacula_config /usr/libexec/bacula/bacula_config.mysql
%post director-sqlite
/usr/sbin/alternatives --install /usr/sbin/bacula-dir bacula-dir /usr/sbin/bacula-dir.sqlite 40 \
--slave /usr/sbin/dbcheck bacula-dbcheck /usr/sbin/dbcheck.sqlite \
--slave %{_libdir}/libbacsql-%{version}.so libbacsql-%{version}.so %{_libdir}/libbacsql-%{version}.so.sqlite \
+ --slave %{_libdir}/libbacsql.so libbacsql.so %{_libdir}/libbacsql-%{version}.so \
--slave /usr/libexec/bacula/create_bacula_database create_bacula_database /usr/libexec/bacula/create_bacula_database.sqlite \
--slave /usr/libexec/bacula/drop_bacula_database drop_bacula_database /usr/libexec/bacula/drop_bacula_database.sqlite \
--slave /usr/libexec/bacula/drop_bacula_tables drop_bacula_tables /usr/libexec/bacula/drop_bacula_tables.sqlite \
--slave /usr/libexec/bacula/grant_bacula_privileges grant_bacula_privileges /usr/libexec/bacula/grant_bacula_privileges.sqlite \
--slave /usr/libexec/bacula/make_bacula_tables make_bacula_tables /usr/libexec/bacula/make_bacula_tables.sqlite \
--slave /usr/libexec/bacula/make_catalog_backup make_catalog_backup /usr/libexec/bacula/make_catalog_backup.sqlite \
- --slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.sqlite
-/sbin/ldconfig
+ --slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.sqlite \
+ --slave /usr/libexec/bacula/bacula_config bacula_config /usr/libexec/bacula/bacula_config.sqlite
%post director-postgresql
/usr/sbin/alternatives --install /usr/sbin/bacula-dir bacula-dir /usr/sbin/bacula-dir.postgresql 60 \
--slave /usr/sbin/dbcheck bacula-dbcheck /usr/sbin/dbcheck.postgresql \
--slave %{_libdir}/libbacsql-%{version}.so libbacsql-%{version}.so %{_libdir}/libbacsql-%{version}.so.postgresql \
+ --slave %{_libdir}/libbacsql.so libbacsql.so %{_libdir}/libbacsql-%{version}.so \
--slave /usr/libexec/bacula/create_bacula_database create_bacula_database /usr/libexec/bacula/create_bacula_database.postgresql \
--slave /usr/libexec/bacula/drop_bacula_database drop_bacula_database /usr/libexec/bacula/drop_bacula_database.postgresql \
--slave /usr/libexec/bacula/drop_bacula_tables drop_bacula_tables /usr/libexec/bacula/drop_bacula_tables.postgresql \
--slave /usr/libexec/bacula/grant_bacula_privileges grant_bacula_privileges /usr/libexec/bacula/grant_bacula_privileges.postgresql \
--slave /usr/libexec/bacula/make_bacula_tables make_bacula_tables /usr/libexec/bacula/make_bacula_tables.postgresql \
--slave /usr/libexec/bacula/make_catalog_backup make_catalog_backup /usr/libexec/bacula/make_catalog_backup.postgresql \
- --slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.postgresql
-/sbin/ldconfig
+ --slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.postgresql \
+ --slave /usr/libexec/bacula/bacula_config bacula_config /usr/libexec/bacula/bacula_config.postgresql
%preun director-mysql
if [ "$1" = 0 ]; then
@@ -912,12 +918,10 @@ fi
%{_libdir}/libbacfind.so
%{_libdir}/libbacpy-%{version}.so
%{_libdir}/libbacpy.so
-%{_libdir}/libbacsql.so
%{_sbindir}/bacula-checkconf
%{_sbindir}/bsmtp
%{_sbindir}/btraceback
%{_sbindir}/bacula
-%{_libexecdir}/bacula/bacula_config
%{_libexecdir}/bacula/btraceback.dbx
%{_libexecdir}/bacula/btraceback.gdb
%{_libexecdir}/bacula/btraceback.mdb
@@ -1018,7 +1022,7 @@ fi
%{_libexecdir}/bacula/make_bacula_tables.mysql
%{_libexecdir}/bacula/make_catalog_backup.mysql
%{_libexecdir}/bacula/update_bacula_tables.mysql
-
+%{_libexecdir}/bacula/bacula_config.mysql
%files director-sqlite
%defattr(-,root,root,-)
@@ -1038,7 +1042,7 @@ fi
%{_libexecdir}/bacula/make_bacula_tables.sqlite
%{_libexecdir}/bacula/make_catalog_backup.sqlite
%{_libexecdir}/bacula/update_bacula_tables.sqlite
-
+%{_libexecdir}/bacula/bacula_config.sqlite
%files director-postgresql
%defattr(-,root,root,-)
@@ -1058,7 +1062,7 @@ fi
%{_libexecdir}/bacula/make_bacula_tables.postgresql
%{_libexecdir}/bacula/make_catalog_backup.postgresql
%{_libexecdir}/bacula/update_bacula_tables.postgresql
-
+%{_libexecdir}/bacula/bacula_config.postgresql
%files storage-common
%defattr(-,root,root,-)
@@ -1129,6 +1133,10 @@ fi
%changelog
+* Wed Jan 25 2012 Simone Caronni <negativo17 at gmail.com> - 5.0.3-22
+- Fix for rhbz#784471.
+- Add libbaccats.so symlink to alternatives, thanks pghmcfc.
+
* Tue Jan 24 2012 Simone Caronni <negativo17 at gmail.com> - 5.0.3-21
- Fix postgresql libs dependency issue.
More information about the scm-commits
mailing list