Move files around between storage and director

This commit is contained in:
Simone Caronni 2011-12-04 11:39:11 +01:00
parent b6d037ecea
commit 5fd2356321

View File

@ -340,7 +340,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
export QMAKE=/usr/bin/qmake-qt4 export QMAKE=/usr/bin/qmake-qt4
build --enable-bat build --enable-bat
%else %else
build build --disable-bat
%endif %endif
if test $? != 0; then if test $? != 0; then
@ -716,24 +716,22 @@ fi
%endif %endif
%{_sbindir}/bacula-dir %{_sbindir}/bacula-dir
%{_sbindir}/bregex %{_sbindir}/bregex
%{_sbindir}/bscan
%{_sbindir}/bwild %{_sbindir}/bwild
%{_sbindir}/dbcheck %{_sbindir}/dbcheck
%{_mandir}/man8/bacula-dir.8.gz %{_mandir}/man8/bacula-dir.8.gz
%{_mandir}/man8/bregex.8.gz %{_mandir}/man8/bregex.8.gz
%{_mandir}/man8/bscan.8.gz
%{_mandir}/man8/bwild.8.gz %{_mandir}/man8/bwild.8.gz
%{_mandir}/man8/dbcheck.8.gz %{_mandir}/man8/dbcheck.8.gz
%{_libexecdir}/%{name}/create_bacula_database %{_libexecdir}/%{name}/create_bacula_database
%{_libexecdir}/%{name}/delete_catalog_backup %{_libexecdir}/%{name}/delete_catalog_backup
%{_libexecdir}/%{name}/disk-changer
%{_libexecdir}/%{name}/drop_bacula_database %{_libexecdir}/%{name}/drop_bacula_database
%{_libexecdir}/%{name}/drop_bacula_tables %{_libexecdir}/%{name}/drop_bacula_tables
%{_libexecdir}/%{name}/dvd-handler
%{_libexecdir}/%{name}/grant_bacula_privileges %{_libexecdir}/%{name}/grant_bacula_privileges
%{_libexecdir}/%{name}/make_bacula_tables %{_libexecdir}/%{name}/make_bacula_tables
%{_libexecdir}/%{name}/make_catalog_backup %{_libexecdir}/%{name}/make_catalog_backup
%{_libexecdir}/%{name}/make_catalog_backup.pl %{_libexecdir}/%{name}/make_catalog_backup.pl
%{_libexecdir}/%{name}/mtx-changer
%{_libexecdir}/%{name}/mtx-changer.conf
%{_libexecdir}/%{name}/update_bacula_tables %{_libexecdir}/%{name}/update_bacula_tables
%files director-mysql %files director-mysql
@ -775,7 +773,6 @@ fi
%{_sbindir}/bcopy %{_sbindir}/bcopy
%{_sbindir}/bextract %{_sbindir}/bextract
%{_sbindir}/bls %{_sbindir}/bls
%{_sbindir}/bscan
%{_sbindir}/btape %{_sbindir}/btape
%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd %config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
@ -784,14 +781,14 @@ fi
%else %else
%{_initrddir}/bacula-sd %{_initrddir}/bacula-sd
%endif %endif
%{_libexecdir}/bacula/disk-changer %{_libexecdir}/%{name}/disk-changer
%{_libexecdir}/bacula/dvd-handler %{_libexecdir}/%{name}/dvd-handler
%{_libexecdir}/bacula/mtx-changer %{_libexecdir}/%{name}/mtx-changer
%{_libexecdir}/%{name}/mtx-changer.conf
%{_mandir}/man8/bacula-sd.8.gz %{_mandir}/man8/bacula-sd.8.gz
%{_mandir}/man8/bcopy.8.gz %{_mandir}/man8/bcopy.8.gz
%{_mandir}/man8/bextract.8.gz %{_mandir}/man8/bextract.8.gz
%{_mandir}/man8/bls.8.gz %{_mandir}/man8/bls.8.gz
%{_mandir}/man8/bscan.8.gz
%{_mandir}/man8/btape.8.gz %{_mandir}/man8/btape.8.gz
%files docs %files docs
@ -811,6 +808,8 @@ fi
%changelog %changelog
* Thu Dec 02 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-4 * Thu Dec 02 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-4
- Rename storage-common to storage and make it provide storage-common. - Rename storage-common to storage and make it provide storage-common.
- Move bscan to director-common.
- Move storage scripts to storage.
* Thu Dec 01 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-3 * Thu Dec 01 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-3
- Add missing conditional for bat in the build section. - Add missing conditional for bat in the build section.