diff --git a/bacula.spec b/bacula.spec index ea943a5..4c42375 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 5.0.3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: GPLv2 with exceptions @@ -111,7 +111,7 @@ This director has support for the sqlite database. %package director-postgresql Summary: Bacula Director with PostgresSQL database support -Group: System Environment/Daemons +Group: System Environment/Daemons Provides: bacula-director = %{version}-%{release} Requires: bacula-director-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} @@ -542,6 +542,8 @@ pushd bacula-sqlite mv %{buildroot}%{_sbindir}/dbcheck %{buildroot}%{_sbindir}/dbcheck.sqlite mv %{buildroot}%{_sbindir}/bcopy %{buildroot}%{_sbindir}/bcopy.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 for script in create_bacula_database drop_bacula_database drop_bacula_tables \ grant_bacula_privileges make_bacula_tables make_catalog_backup \ @@ -556,6 +558,8 @@ pushd bacula-mysql mv %{buildroot}%{_sbindir}/dbcheck %{buildroot}%{_sbindir}/dbcheck.mysql mv %{buildroot}%{_sbindir}/bcopy %{buildroot}%{_sbindir}/bcopy.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 for script in create_bacula_database drop_bacula_database drop_bacula_tables \ grant_bacula_privileges make_bacula_tables make_catalog_backup \ @@ -570,6 +574,8 @@ pushd bacula-postgresql mv %{buildroot}%{_sbindir}/dbcheck %{buildroot}%{_sbindir}/dbcheck.postgresql mv %{buildroot}%{_sbindir}/bcopy %{buildroot}%{_sbindir}/bcopy.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 for script in create_bacula_database drop_bacula_database drop_bacula_tables \ grant_bacula_privileges make_bacula_tables make_catalog_backup \ @@ -651,6 +657,7 @@ rm -rf %{buildroot} %post director-mysql /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 /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 \ @@ -658,10 +665,12 @@ rm -rf %{buildroot} --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 %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 /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 \ @@ -669,10 +678,12 @@ rm -rf %{buildroot} --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 %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 /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 \ @@ -680,6 +691,7 @@ rm -rf %{buildroot} --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 %preun director-mysql if [ "$1" = 0 ]; then @@ -704,15 +716,18 @@ exit 0 %post storage-mysql /usr/sbin/alternatives --install /usr/sbin/bcopy bacula-sd /usr/sbin/bcopy.mysql 50 \ - --slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.mysql + --slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.mysql \ + --slave /usr/sbin/btape bacula-btape /usr/sbin/btape.mysql %post storage-sqlite /usr/sbin/alternatives --install /usr/sbin/bcopy bacula-sd /usr/sbin/bcopy.sqlite 40 \ - --slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.sqlite + --slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.sqlite \ + --slave /usr/sbin/btape bacula-btape /usr/sbin/btape.sqlite %post storage-postgresql /usr/sbin/alternatives --install /usr/sbin/bcopy bacula-sd /usr/sbin/bcopy.postgresql 60 \ - --slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.postgresql + --slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.postgresql \ + --slave /usr/sbin/btape bacula-btape /usr/sbin/btape.postgresql %preun storage-mysql if [ "$1" = 0 ]; then @@ -897,7 +912,6 @@ fi %{_libdir}/libbacfind.so %{_libdir}/libbacpy-%{version}.so %{_libdir}/libbacpy.so -%{_libdir}/libbacsql-%{version}.so %{_libdir}/libbacsql.so %{_sbindir}/bacula-checkconf %{_sbindir}/bsmtp @@ -990,6 +1004,7 @@ fi %defattr(-,root,root,-) %{_sbindir}/bacula-dir.mysql %{_sbindir}/dbcheck.mysql +%{_libdir}/libbacsql-%{version}.so.mysql %{_libexecdir}/bacula/create_mysql_database %{_libexecdir}/bacula/drop_mysql_database %{_libexecdir}/bacula/drop_mysql_tables @@ -1009,6 +1024,7 @@ fi %defattr(-,root,root,-) %{_sbindir}/bacula-dir.sqlite %{_sbindir}/dbcheck.sqlite +%{_libdir}/libbacsql-%{version}.so.sqlite %{_libexecdir}/bacula/create_sqlite3_database %{_libexecdir}/bacula/drop_sqlite3_database %{_libexecdir}/bacula/drop_sqlite3_tables @@ -1028,6 +1044,7 @@ fi %defattr(-,root,root,-) %{_sbindir}/bacula-dir.postgresql %{_sbindir}/dbcheck.postgresql +%{_libdir}/libbacsql-%{version}.so.postgresql %{_libexecdir}/bacula/create_postgresql_database %{_libexecdir}/bacula/drop_postgresql_database %{_libexecdir}/bacula/drop_postgresql_tables @@ -1055,7 +1072,6 @@ fi %{_sbindir}/bacula-sd %{_sbindir}/bextract %{_sbindir}/bls -%{_sbindir}/btape %{_libexecdir}/bacula/disk-changer %{_libexecdir}/bacula/dvd-handler %{_libexecdir}/bacula/mtx-changer @@ -1071,19 +1087,19 @@ fi %defattr(-,root,root,-) %{_sbindir}/bcopy.mysql %{_sbindir}/bscan.mysql - +%{_sbindir}/btape.mysql %files storage-sqlite %defattr(-,root,root,-) %{_sbindir}/bcopy.sqlite %{_sbindir}/bscan.sqlite - +%{_sbindir}/btape.sqlite %files storage-postgresql %defattr(-,root,root,-) %{_sbindir}/bcopy.postgresql %{_sbindir}/bscan.postgresql - +%{_sbindir}/btape.postgresql %files traymonitor %defattr(-,root,root,-) @@ -1113,6 +1129,9 @@ fi %changelog +* Tue Jan 24 2012 Simone Caronni - 5.0.3-21 +- Fix postgresql libs dependency issue. + * Tue Jan 24 2012 Simone Caronni - 5.0.3-20 - Fix rhbz#728693 and rhbz#726147. - Remove bacula-docs BuildRequires.