X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=bacula.spec;h=1b52e5ffd64a60c8817c2661b61bbb7fda00036b;hb=HEAD;hp=6b740f6d0623009613d488b3c8eadb3358b74aab;hpb=30caee93c14bca17bfb7d4c9ff79fe22659e4eeb;p=packages%2Fbacula.git diff --git a/bacula.spec b/bacula.spec index 6b740f6..1b52e5f 100644 --- a/bacula.spec +++ b/bacula.spec @@ -1,46 +1,35 @@ -# TODO: +## TODO: +# - fix libtoolize # - update desktop files, think about su-wrappers for console (with .desktop files) # - fix log file permissions -# - check on upgrade (5.0 and 5.2 databases are NOT compatible) # # Conditional build: -%bcond_without wx # wx-console program -%bcond_without gtk # the GTK tray-monitor and wx-console -%if "%{pld_release}" == "ac" -%bcond_with qt # BAT / qt-console Qt4 GUI -%else -%bcond_without qt # BAT / qt-console Qt4 GUI -%endif +%bcond_without qt # BAT / qt-console Qt5 GUI %bcond_without mysql # use MySQL %bcond_without pgsql # use PostgreSQL %bcond_without sqlite3 # use SQLite3 -%bcond_without python # Python Scripting support, http://www.bacula.org/3.0.x-manuals/en/concepts/concepts/Python_Scripting.html -%bcond_without nagios # build nagios plugin -%bcond_with rescue +%bcond_without nagios # build nagios plugin +%bcond_with s3 # Amazon S3 cloud backend %bcond_with sqlite3_sync_off # makes SQLite3 backend much faster, but less reliable %if %{without sqlite3} %undefine with_sqlite3_sync_off %endif -%if %{without gtk} -%undefine with_wx -%endif +# Bacula requires this specific, custom version +%define libs3_version 20200523 -%define qtver 4.8.4 Summary: Bacula - The Network Backup Solution Summary(pl.UTF-8): Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci Name: bacula -Version: 5.2.13 -Release: 1 +Version: 11.0.6 +Release: 2 License: AGPL v3 Group: Networking/Utilities Source0: http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz -# Source0-md5: 43417bae0c221afb1f30a581c9e0f2fe -Source1: http://downloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2 -# Source1-md5: 0e7af41cc3b1c59662457679b02bf873 -Source2: http://downloads.sourceforge.net/bacula/%{name}-rescue-5.0.1.tar.gz -# Source2-md5: bb194aed8e204f54bf2f61d7e721f257 +# Source0-md5: 0e3cd4e29878b09ae4554bae64785736 +Source1: https://www.bacula.org/downloads/libs3-%{libs3_version}.tar.gz +# Source1-md5: ca97bc4133a21981139181ec8571f202 Source10: %{name}-dir.init Source11: %{name}-fd.init Source12: %{name}-sd.init @@ -53,35 +42,32 @@ Source18: %{name}-fd.service Source19: %{name}-sd.service Patch0: %{name}-mtx-changer.patch Patch1: %{name}-branding.patch -Patch2: %{name}-conf.patch -Patch3: %{name}-desktop.patch -Patch4: make_catalog_backup-setup-home.patch -Patch5: %{name}-wx-console-build.patch -Patch6: %{name}-no_lockmgr.patch +Patch2: %{name}-desktop.patch +Patch3: make_catalog_backup-setup-home.patch +Patch4: %{name}-no_lockmgr.patch +Patch5: x32.patch +Patch6: libs3-curl.patch URL: http://www.bacula.org/ BuildRequires: acl-devel -BuildRequires: autoconf +BuildRequires: autoconf >= 2.61 BuildRequires: automake -BuildRequires: gettext-devel -%{?with_gtk:BuildRequires: gtk+2-devel} +%{?with_s3:BuildRequires: curl-devel} +BuildRequires: gettext-tools BuildRequires: libcap-devel BuildRequires: libtool >= 2:2.2 -%if %{with rescue} -BuildRequires: fakeroot -%endif BuildRequires: libwrap-devel +%{?with_s3:BuildRequires: libxml2-devel} BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: pkgconfig -%if %{with python} -BuildRequires: python-devel +BuildRequires: python BuildRequires: python-modules -%endif %if %{with qt} -BuildRequires: QtCore-devel -BuildRequires: QtGui-devel -BuildRequires: qt4-build >= %{qtver} -BuildRequires: qt4-qmake >= %{qtver} +BuildRequires: Qt5Core-devel +BuildRequires: Qt5Gui-devel +BuildRequires: Qt5Widgets-devel +BuildRequires: qt5-build +BuildRequires: qt5-qmake %endif %{?with_mysql:BuildRequires: mysql-devel} %{?with_pgsql:BuildRequires: postgresql-devel} @@ -92,11 +78,8 @@ BuildRequires: rpmbuild(macros) >= 1.644 BuildRequires: sed >= 4.0 %{?with_sqlite3:BuildRequires: sqlite3-devel} BuildRequires: which -Requires: systemd-units >= 38 -%if %{with wx} -BuildRequires: wxGTK2-unicode-devel >= 2.4.0 -%endif BuildRequires: zlib-devel +Requires: systemd-units >= 38 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/%{name} @@ -183,7 +166,8 @@ Summary(pl.UTF-8): Usługi Bacula Director i Catalog Group: Networking/Utilities Requires(post): sed >= 4.0 Requires: %{name}-common = %{version}-%{release} -Requires: bacula(db) = %{version}-%{release} +Requires: bacula-db = %{version}-%{release} +Requires: systemd-units >= 38 Obsoletes: bacula-updatedb %description dir @@ -235,36 +219,13 @@ Bacula Console to program umożliwiający administratorowi lub użytkownikowi komunikowanie się z programem Bacula Director. To jest interfejs czysto tekstowy. -%package console-wx -Summary: Bacula wxWidgets Console -Summary(pl.UTF-8): Konsola Baculi oparta na wxWidgets -Group: Networking/Utilities -Requires(post): sed >= 4.0 -Requires: %{name}-common = %{version}-%{release} - -%description console-wx -Bacula - It comes by night and sucks the vital essence from your -computers. - -Bacula Console is the program that allows the administrator or user to -communicate with the Bacula Director. This is the wxWidgets GUI -interface. - -%description console-wx -l pl.UTF-8 -Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów. - -Bacula Console to program umożliwiający administratorowi lub -użytkownikowi komunikowanie się z programem Bacula Director. To jest -interfejs graficzny oparty na wxWidgets. - %package console-qt Summary: bat – The Bacula Administration Tool Summary(pl.UTF-8): bat – narzędzie administratora Baculi Group: Networking/Utilities Requires(post): sed >= 4.0 Requires: %{name}-common = %{version}-%{release} -Requires: QtCore >= %{qtver} -Obsoletes: bacula-console-qt4 < 5.2.13-1 +Requires: Qt5Core %description console-qt Bacula - It comes by night and sucks the vital essence from your @@ -301,6 +262,7 @@ Summary(pl.UTF-8): Usługi Bacula File (klient) Group: Networking/Utilities Requires(post): sed >= 4.0 Requires: %{name}-common = %{version}-%{release} +Requires: systemd-units >= 38 %description fd Bacula - It comes by night and sucks the vital essence from your @@ -336,6 +298,7 @@ Summary(pl.UTF-8): Usługi Bacula Storage Group: Networking/Utilities Requires(post): sed >= 4.0 Requires: %{name}-common = %{version}-%{release} +Requires: systemd-units >= 38 Suggests: mtx Conflicts: dvd+rw-tools <= 5.21.4.10.8-1 @@ -367,8 +330,8 @@ Summary(pl.UTF-8): Sterownik bazy PostgreSQL dla Baculi Group: Networking/Utilities Requires(post): /sbin/ldconfig Requires: %{name}-common = %{version}-%{release} -Provides: bacula(db) = %{version}-%{release} -Obsoletes: bacula(db) +Provides: bacula-db = %{version}-%{release} +Obsoletes: bacula-db %description db-postgresql PostgreSQL database driver for Bacula. @@ -382,8 +345,8 @@ Summary(pl.UTF-8): Sterownik bazy MySQL dla Baculi Group: Networking/Utilities Requires(post): /sbin/ldconfig Requires: %{name}-common = %{version}-%{release} -Provides: bacula(db) = %{version}-%{release} -Obsoletes: bacula(db) +Provides: bacula-db = %{version}-%{release} +Obsoletes: bacula-db %description db-mysql MySQL database driver for Bacula. @@ -397,8 +360,8 @@ Summary(pl.UTF-8): Sterownik bazy SQLite dla Baculi Group: Networking/Utilities Requires(post): /sbin/ldconfig Requires: %{name}-common = %{version}-%{release} -Provides: bacula(db) = %{version}-%{release} -Obsoletes: bacula(db) +Provides: bacula-db = %{version}-%{release} +Obsoletes: bacula-db %description db-sqlite3 SQLite database driver for Bacula. @@ -406,44 +369,6 @@ SQLite database driver for Bacula. %description db-sqlite3 -l pl.UTF-8 Sterownik bazy SQLite dla Baculi. -%package rescue -Summary: Bacula - The Network Backup Solution -Summary(pl.UTF-8): Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci -Group: Networking/Utilities -Requires: %{name}-fd = %{version}-%{release} -Requires: coreutils -Requires: util-linux - -%description rescue -Bacula - It comes by night and sucks the vital essence from your -computers. - -Bacula is a set of computer programs that permit you (or the system -administrator) to manage backup, recovery, and verification of -computer data across a network of computers of different kinds. In -technical terms, it is a network client/server based backup program. -Bacula is relatively easy to use and efficient, while offering many -advanced storage management features that make it easy to find and -recover lost or damaged files. - -This package installs scripts for disaster recovery and builds rescue -floppy disk for bare metal recovery. - -%description rescue -l pl.UTF-8 -Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów. - -Bacula to zbiór programów umożliwiających administratorowi na -zarządzanie kopiami zapasowymi, odzyskiwaniem i weryfikacją danych w -sieci komputerów różnego rodzaju. W terminologii technicznej jest to -program do kopii zapasowych pracujący w architekturze klient-serwer. -Bacula jest stosunkowo łatwa w użyciu i wydajna, oferując przy tym -wiele zaawansowanych możliwości przy zarządzaniu nośnikami, -ułatwiających znalezienie i odzyskanie utraconych lub uszkodzonych -plików. - -Ten pakiet zawiera skrypty do odtwarzania po awarii i tworzy dyskietkę -ratunkowe do odtwarzania systemu od zera. - %package -n nagios-plugin-check_bacula Summary: Nagios plugin to check bacula Group: Networking @@ -462,10 +387,14 @@ Nagios plugin to check bacula. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%ifarch x32 %patch5 -p1 +%endif +%if %{with s3} +cd libs3-%{libs3_version} %patch6 -p1 - -tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue +cd .. +%endif sed -i -e 's#bindir=.*#bindir=%{_bindir}#g' \ src/cats/create_* src/cats/delete_* src/cats/drop_* \ @@ -475,24 +404,31 @@ sed -i -e 's/@basename@/--hostname--/' src/*/*.conf.in %build cd autoconf -%{__aclocal} -I bacula-macros -I gettext-macros -# $BUILD_DIR not seen by libtoolize, export it -BUILD_DIR=.. %{__libtoolize} +%{__aclocal} -I bacula-macros -I gettext-macros -I libtool +## $BUILD_DIR not seen by libtoolize, export it +#BUILD_DIR=.. %%{__libtoolize} cd .. %{__autoconf} --prepend-include=$(pwd)/autoconf autoconf/configure.in > configure +%if %{with s3} +cd libs3-%{libs3_version} +CFLAGS="%{rpmcflags} -Wno-stringop-overflow" make VERBOSE=1 build/lib/libs3.a +ln -s ../inc build/include +cd .. +%endif + CPPFLAGS="-I/usr/include/ncurses -I%{_includedir}/readline" +CXXFLAGS="%{rpmcxxflags} -Wno-narrowing" +CFLAGS="%{rpmcflags} -Wno-narrowing" -WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \ -QMAKE=%{_bindir}/qmake-qt4 \ +BUILD_DIR=$(pwd) \ +QMAKE=%{_bindir}/qmake-qt5 \ %configure \ + DISTNAME=pld-linux \ --with-scriptdir=%{_libexecdir}/%{name} \ %{?with_qt:--enable-bat} \ --disable-conio \ --enable-smartalloc \ - %{?with_wx:--enable-bwx-console} \ - %{?with_gtk:--enable-tray-monitor} \ - %{?with_python:--with-python} \ --with-readline \ --with-tcp-wrappers \ --with-working-dir=%{_var}/lib/%{name} \ @@ -507,6 +443,8 @@ QMAKE=%{_bindir}/qmake-qt4 \ %{?with_mysql:--with-mysql} \ %{?with_sqlite3:--with-sqlite3} \ %{?with_sqlite3_sync_off:--enable-extra-sqlite3-init="pragma synchronous=0;"} \ + %{!?with_s3:--without-s3} \ + %{?with_s3:--with-s3=$PWD/libs3-%{libs3_version}/build} \ --with-dir-password="#FAKE-dir-password#" \ --with-fd-password="#FAKE-fd-password#" \ --with-sd-password="#FAKE-sd-password#" \ @@ -517,11 +455,13 @@ QMAKE=%{_bindir}/qmake-qt4 \ %if %{with qt} cd src/qt-console -qmake-qt4 bat.pro +qmake-qt5 bat.pro cd ../.. %endif -%{__make} 2>&1 | tee log +%{__make} \ + %{?with_s3:S3_LIBS="$PWD/libs3-%{libs3_version}/build/lib/libs3.a $(pkg-config --libs libcurl libxml-2.0)"} \ + 2>&1 | tee log # check for build errors grep "Error in" log && exit 1 @@ -530,33 +470,32 @@ grep "Error in" log && exit 1 %{__make} -C examples/nagios/check_bacula %endif -%if %{with rescue} -cd rescue -%configure \ - --with-bacula=../ -cd linux/cdrom -fakeroot %{__make} -%endif - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig} \ - $RPM_BUILD_ROOT%{_sysconfdir}/rescue \ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ - $RPM_BUILD_ROOT{%{_mandir},%{_bindir},/var/log/bacula} \ + $RPM_BUILD_ROOT{%{_mandir},%{_bindir},/var/log{,/archive}/bacula} \ $RPM_BUILD_ROOT%{systemdunitdir} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__make} -C src/stored install-aligned \ + DESTDIR=$RPM_BUILD_ROOT + +%if %{with s3} +%{__make} -C src/stored install-cloud \ + DESTDIR=$RPM_BUILD_ROOT +%endif + # create copies of make_catalog_backup for specific databases; zeore default one (will be ghost) for database in %{databases}; do sed -e "s#default_db_type=.*#default_db_type=${database}#g" \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/make_catalog_backup \ - > $RPM_BUILD_ROOT%{_libdir}/%{name}/make_${database}_catalog_backup - chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/make_${database}_catalog_backup + $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_catalog_backup \ + > $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_${database}_catalog_backup + chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_${database}_catalog_backup done -:> $RPM_BUILD_ROOT%{_libdir}/%{name}/make_catalog_backup +:> $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_catalog_backup # we use db dependant (at compile time) shell script only rm $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_catalog_backup.pl @@ -576,12 +515,6 @@ cp -a %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/bacula-dir.service cp -a %{SOURCE18} $RPM_BUILD_ROOT%{systemdunitdir}/bacula-fd.service cp -a %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/bacula-sd.service -%if %{with wx} -cp -a scripts/bacula.png $RPM_BUILD_ROOT%{_pixmapsdir}/bacula.png -sed -e 's/gnome-console/wx-console/g;s/Console/Wx Console/g' \ - scripts/wxconsole.desktop.consolehelper > $RPM_BUILD_ROOT%{_desktopdir}/bacula-wx.desktop -%endif - %if %{with qt} # qmake somewhy does not always create install_bins target. install our own the bin rm -f $RPM_BUILD_ROOT%{_sbindir}/bat @@ -590,14 +523,6 @@ cp -a scripts/bacula.png $RPM_BUILD_ROOT%{_pixmapsdir}/bacula.png cp -a scripts/bat.desktop $RPM_BUILD_ROOT%{_desktopdir} %endif -%if %{with rescue} -# install the rescue stuff, these are the rescue scripts -cp -a rescue/linux/floppy/backup.etc.list $RPM_BUILD_ROOT%{_sysconfdir}/rescue -cp -a rescue/linux/floppy/sfdisk.bz2 $RPM_BUILD_ROOT%{_sysconfdir}/rescue -install -p rescue/linux/floppy/*_* $RPM_BUILD_ROOT%{_sysconfdir}/rescue -install -p rescue/linux/floppy/getdiskinfo $RPM_BUILD_ROOT%{_sysconfdir}/rescue -%endif - touch $RPM_BUILD_ROOT/var/log/bacula/log # install the updatedb scripts for older versions that last full release @@ -605,7 +530,6 @@ touch $RPM_BUILD_ROOT/var/log/bacula/log # 5.0 -> 5.2 : 12_to_14 install -p updatedb/update_*_tables_10_to_11 $RPM_BUILD_ROOT%{_libexecdir}/%{name} install -p updatedb/update_*_tables_11_to_12 $RPM_BUILD_ROOT%{_libexecdir}/%{name} -install -p updatedb/update_*_tables_12_to_14 $RPM_BUILD_ROOT%{_libexecdir}/%{name} # place for site passwords touch $RPM_BUILD_ROOT%{_sysconfdir}/{dir-password,fd-password,sd-password} @@ -615,9 +539,6 @@ mv $RPM_BUILD_ROOT%{_libexecdir}/%{name}/mtx-changer.conf $RPM_BUILD_ROOT%{_sysc # some file changes rm -f $RPM_BUILD_ROOT%{_libexecdir}/%{name}/{gconsole,startmysql,stopmysql,bacula,bconsole,fd} -%if %{without wx} -rm -f $RPM_BUILD_ROOT%{_desktopdir}/bacula-wx.desktop -%endif rm $RPM_BUILD_ROOT%{_docdir}/bacula/ChangeLog rm $RPM_BUILD_ROOT%{_docdir}/bacula/INSTALL @@ -625,7 +546,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/bacula/LICENSE rm $RPM_BUILD_ROOT%{_docdir}/bacula/README rm $RPM_BUILD_ROOT%{_docdir}/bacula/ReleaseNotes rm $RPM_BUILD_ROOT%{_docdir}/bacula/VERIFYING -rm $RPM_BUILD_ROOT%{_docdir}/bacula/technotes # startup scripts, those in /etc/rc.d/init.d are better rm $RPM_BUILD_ROOT%{_sbindir}/bacula @@ -639,8 +559,8 @@ mv $RPM_BUILD_ROOT%{_sbindir}/{,bacula-}dbcheck mv $RPM_BUILD_ROOT%{_mandir}/man8/{,bacula-}dbcheck.8.gz # no -devel files packaged, so this is also useless -rm $RPM_BUILD_ROOT%{_libdir}/libbac{,cfg,find,py,sql,cats}.{so,la} -#rm $RPM_BUILD_ROOT%{_libdir}/libbaccats*.{so,la} +rm $RPM_BUILD_ROOT%{_libdir}/libbac{,cfg,find,sql,cats,sd}.{so,la} +rm $RPM_BUILD_ROOT%{_libdir}/bacula-sd-*-driver.so %{?with_mysql:rm $RPM_BUILD_ROOT%{_libdir}/libbaccats-mysql.{la,so}} %{?with_pgsql:rm $RPM_BUILD_ROOT%{_libdir}/libbaccats-postgresql.{la,so}} %{?with_sqlite3:rm $RPM_BUILD_ROOT%{_libdir}/libbaccats-sqlite3.{la,so}} @@ -649,7 +569,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/libbac{,cfg,find,py,sql,cats}.{so,la} install -d $RPM_BUILD_ROOT%{nagiosplugindir} %{__make} -C examples/nagios/check_bacula install \ sbindir=%{nagiosplugindir} \ - INSTALL_PROGRAM="libtool --mode=install install -p" \ DESTDIR=$RPM_BUILD_ROOT %endif @@ -756,9 +675,6 @@ fi %post console %update_configs -%post console-wx -%update_configs - %triggerpostun common -- %{name}-common < 5.0.1-2 find %{_sysconfdir}/bat.conf* -perm /007 -print0 2>/dev/null | xargs -0 -r chmod 600 || : @@ -768,27 +684,6 @@ find %{_sysconfdir}/bat.conf* -perm /007 -print0 2>/dev/null | xargs -0 -r chmod %post tray-monitor %update_configs -%post rescue -# link our current installed conf file to the rescue directory -ln -sf %{_sysconfdir}/bacula-fd.conf %{_sysconfdir}/rescue/bacula-fd.conf - -# run getdiskinfo -echo "Creating rescue files for this system..." -cd %{_sysconfdir}/rescue -./getdiskinfo - -%preun rescue -# remove the files created after the initial rpm installation -if [ "$1" = "0" ]; then - rm -f %{_sysconfdir}/rescue/bacula-fd.conf - rm -f %{_sysconfdir}/rescue/partition.* - rm -f %{_sysconfdir}/rescue/format.* - rm -f %{_sysconfdir}/rescue/mount_drives - rm -f %{_sysconfdir}/rescue/start_network - rm -f %{_sysconfdir}/rescue/sfdisk - rm -rf %{_sysconfdir}/rescue/diskinfo/* -fi - %define db_post() \ /sbin/ldconfig \ for name in "create database" "drop tables" "drop database" "grant privileges" "make tables" "update tables"; do \ @@ -818,17 +713,16 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %files common %defattr(644,root,root,755) %doc LICENSE -%{?with_python:%doc examples/python} %dir %{_sysconfdir} %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*-password # do not remove bsmtp from files. Fix build if it is not installed. %attr(755,root,root) %{_sbindir}/bsmtp %attr(755,root,root) %{_sbindir}/btraceback -%attr(755,root,root) %{_libdir}/libbac-5*.so -%attr(755,root,root) %{_libdir}/libbaccfg-5*.so -%attr(755,root,root) %{_libdir}/libbacfind-5*.so -%attr(755,root,root) %{_libdir}/libbacpy-5*.so -%attr(755,root,root) %{_libdir}/libbacsql-5*.so +%attr(755,root,root) %{_libdir}/libbac-11*.so +%attr(755,root,root) %{_libdir}/libbacsd-11*.so +%attr(755,root,root) %{_libdir}/libbaccfg-11*.so +%attr(755,root,root) %{_libdir}/libbacfind-11*.so +%attr(755,root,root) %{_libdir}/libbacsql-11*.so %{_mandir}/man8/bacula.8* %{_mandir}/man1/bsmtp.1* %{_mandir}/man8/btraceback.8* @@ -839,10 +733,11 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %attr(770,root,bacula) %dir %{_localstatedir} %attr(750,bacula,logs) %dir /var/log/bacula %attr(640,bacula,logs) %ghost /var/log/bacula/log +%attr(750,bacula,logs) %dir /var/log/archive/bacula %files dir %defattr(644,root,root,755) -%doc ChangeLog CheckList ReleaseNotes LICENSE +%doc ChangeLog ReleaseNotes LICENSE #%doc examples %{name}-docs-%{version}/manual/{*.pdf,bacula} %attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bacula-dir.conf %attr(640,root,root) %config(noreplace) /etc/logrotate.d/bacula-dir @@ -850,6 +745,7 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bacula-dir %{systemdunitdir}/bacula-dir.service %attr(755,root,root) %{_sbindir}/bacula-dir +%attr(755,root,root) %{_sbindir}/bdirjson %attr(755,root,root) %{_sbindir}/bregex %attr(755,root,root) %{_sbindir}/bwild %attr(755,root,root) %{_sbindir}/bacula-dbcheck @@ -870,9 +766,9 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_tables %attr(755,root,root) %{_libexecdir}/%{name}/update_postgresql_* %attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_catalog_backup -%attr(755,root,root) %{_libdir}/libbaccats-postgresql-5*.so +%attr(755,root,root) %{_libdir}/libbaccats-postgresql-11*.so -%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so +%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so %ghost %{_libexecdir}/%{name}/create_bacula_database %ghost %{_libexecdir}/%{name}/drop_bacula_tables %ghost %{_libexecdir}/%{name}/drop_bacula_database @@ -892,9 +788,9 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_tables %attr(755,root,root) %{_libexecdir}/%{name}/update_mysql_* %attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_catalog_backup -%attr(755,root,root) %{_libdir}/libbaccats-mysql-5*.so +%attr(755,root,root) %{_libdir}/libbaccats-mysql-11*.so -%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so +%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so %ghost %{_libexecdir}/%{name}/create_bacula_database %ghost %{_libexecdir}/%{name}/drop_bacula_tables %ghost %{_libexecdir}/%{name}/drop_bacula_database @@ -914,9 +810,9 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables %attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_* %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_catalog_backup -%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-5*.so +%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-11*.so -%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so +%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so %ghost %{_libexecdir}/%{name}/create_bacula_database %ghost %{_libexecdir}/%{name}/drop_bacula_tables %ghost %{_libexecdir}/%{name}/drop_bacula_database @@ -934,6 +830,7 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bacula-fd %{systemdunitdir}/bacula-fd.service %attr(755,root,root) %{_sbindir}/bacula-fd +%attr(755,root,root) %{_sbindir}/bfdjson %attr(755,root,root) %{_libdir}/bpipe-fd.so %{_mandir}/man8/bacula-fd.8* @@ -950,10 +847,19 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %attr(755,root,root) %{_sbindir}/bextract %attr(755,root,root) %{_sbindir}/bls %attr(755,root,root) %{_sbindir}/bscan +%attr(755,root,root) %{_sbindir}/bsdjson %attr(755,root,root) %{_sbindir}/btape -%attr(755,root,root) %{_libexecdir}/%{name}/mtx-changer +%attr(755,root,root) %{_libexecdir}/%{name}/baculabackupreport +%attr(755,root,root) %{_libexecdir}/%{name}/bacula-tray-monitor.desktop %attr(755,root,root) %{_libexecdir}/%{name}/disk-changer -%attr(755,root,root) %{_libexecdir}/%{name}/dvd-handler +%attr(755,root,root) %{_libexecdir}/%{name}/isworm +%attr(755,root,root) %{_libexecdir}/%{name}/mtx-changer +%attr(755,root,root) %{_libexecdir}/%{name}/tapealert +%attr(755,root,root) %{_libdir}/bacula-sd-aligned-driver-11.*.so +%if %{with s3} +%attr(755,root,root) %{_libdir}/bacula-sd-cloud-driver-11.*.so +%endif + %{_mandir}/man8/bacula-sd.8* %{_mandir}/man8/bcopy.8* %{_mandir}/man8/bextract.8* @@ -966,19 +872,9 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %doc LICENSE %attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bconsole.conf %attr(755,root,root) %{_sbindir}/bconsole +%attr(755,root,root) %{_sbindir}/bbconsjson %{_mandir}/man8/bconsole.8* -%if %{with wx} -%files console-wx -%defattr(644,root,root,755) -%doc LICENSE -%{_pixmapsdir}/%{name}.png -%{_desktopdir}/bacula-wx.desktop -%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bwx-console.conf -%attr(755,root,root) %{_sbindir}/bwx-console -%{_mandir}/man1/bacula-bwxconsole.1* -%endif - %if %{with qt} %files console-qt %defattr(644,root,root,755) @@ -993,34 +889,6 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %{_docdir}/%{name} %endif -%if %{with gtk} -%files tray-monitor -%defattr(644,root,root,755) -%doc LICENSE -%attr(755,root,root) %{_sbindir}/bacula-tray-monitor -#%{_pixmapsdir}/%{name}-tray-monitor.xpm -#%{_desktopdir}/%{name}-tray-monitor.desktop -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tray-monitor.conf -%{_mandir}/man1/bacula-tray-monitor.1* -%endif - -%if %{with rescue} -%files rescue -%defattr(644,root,root,755) -%doc LICENSE -%dir %{_sysconfdir}/rescue -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/backup.etc.list -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/bacula-fd -%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/format_floppy -%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/getdiskinfo -%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/make_rescue_disk -%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/restore_bacula -%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/restore_etc -%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/run_grub -%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/run_lilo -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/sfdisk.bz2 -%endif - %if %{with nagios} %files -n nagios-plugin-check_bacula %defattr(644,root,root,755)