From ea4bc474003cdc69eb4c68de5a5b23932fca688e Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Jul 24 2017 13:42:54 +0000 Subject: Update to 9.0.2 --- diff --git a/bacula-9.0.0-tray-monitor-desktop.patch b/bacula-9.0.0-tray-monitor-desktop.patch deleted file mode 100644 index 381d32a..0000000 --- a/bacula-9.0.0-tray-monitor-desktop.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur bacula-9.0.0.old/autoconf/configure.in bacula-9.0.0/autoconf/configure.in ---- bacula-9.0.0.old/autoconf/configure.in 2017-07-11 09:40:40.505653594 +0200 -+++ bacula-9.0.0/autoconf/configure.in 2017-07-11 09:42:22.830614109 +0200 -@@ -3394,6 +3394,7 @@ - scripts/dvd-simulator \ - scripts/logwatch/Makefile \ - scripts/logwatch/logfile.bacula.conf \ -+ scripts/bacula-tray-monitor.desktop \ - scripts/bat.desktop \ - scripts/bat.desktop.xsu \ - scripts/bat.desktop.consolehelper \ -diff -Naur bacula-9.0.0.old/configure bacula-9.0.0/configure ---- bacula-9.0.0.old/configure 2017-07-11 09:40:40.498653460 +0200 -+++ bacula-9.0.0/configure 2017-07-11 09:41:47.326933869 +0200 -@@ -31192,7 +31192,7 @@ - fi - - --ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES" -+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bacula-tray-monitor.desktop scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES" - - ac_config_commands="$ac_config_commands default" - diff --git a/bacula-9.0.2-desktop.patch b/bacula-9.0.2-desktop.patch new file mode 100644 index 0000000..611e12b --- /dev/null +++ b/bacula-9.0.2-desktop.patch @@ -0,0 +1,39 @@ +diff -Naur bacula-9.0.2.old/scripts/bacula-tray-monitor.desktop.in bacula-9.0.2/scripts/bacula-tray-monitor.desktop.in +--- bacula-9.0.2.old/scripts/bacula-tray-monitor.desktop.in 2017-07-24 15:22:19.884540422 +0200 ++++ bacula-9.0.2/scripts/bacula-tray-monitor.desktop.in 2017-07-24 15:37:02.175038149 +0200 +@@ -1,10 +1,9 @@ + [Desktop Entry] + Name=Bacula Monitor + Comment=Notification Tray Monitor +-Icon=/usr/share/pixmaps/bacula-tray-monitor.xpm ++Icon=/usr/share/pixmaps/bacula-tray-monitor.png + Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/tray-monitor.conf + Terminal=false + Type=Application +-Encoding=UTF-8 + X-Desktop-File-Install-Version=0.3 +-Categories=System;Application;Utility;X-Red-Hat-Base; ++Categories=Utility; +diff -Naur bacula-9.0.2.old/scripts/bat.desktop.in bacula-9.0.2/scripts/bat.desktop.in +--- bacula-9.0.2.old/scripts/bat.desktop.in 2017-07-24 15:22:19.884540422 +0200 ++++ bacula-9.0.2/scripts/bat.desktop.in 2017-07-24 15:36:22.753301014 +0200 +@@ -5,7 +5,6 @@ + Exec=@sbindir@/bat -c @sysconfdir@/bat.conf + Terminal=false + Type=Application +-Encoding=UTF-8 + StartupNotify=true + X-Desktop-File-Install-Version=0.3 +-Categories=System;Application;Utility;X-Red-Hat-Base; ++Categories=Utility; +diff -Naur bacula-9.0.2.old/scripts/Makefile.in bacula-9.0.2/scripts/Makefile.in +--- bacula-9.0.2.old/scripts/Makefile.in 2017-07-24 15:22:19.884540422 +0200 ++++ bacula-9.0.2/scripts/Makefile.in 2017-07-24 15:25:03.829605989 +0200 +@@ -67,7 +67,6 @@ + $(MV) -f ${DESTDIR}${scriptdir}/baculabackupreport ${DESTDIR}${scriptdir}/baculabackupreport.old; \ + fi + $(INSTALL_SCRIPT) baculabackupreport $(DESTDIR)$(scriptdir)/baculabackupreport +- $(INSTALL_SCRIPT) bacula-tray-monitor.desktop $(DESTDIR)$(scriptdir)/bacula-tray-monitor.desktop + chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \ + $(DESTDIR)$(scriptdir)/btraceback.dbx \ + $(DESTDIR)$(scriptdir)/btraceback.mdb diff --git a/bacula.spec b/bacula.spec index 813e633..805a349 100644 --- a/bacula.spec +++ b/bacula.spec @@ -2,8 +2,8 @@ %global username bacula Name: bacula -Version: 9.0.1 -Release: 2%{?dist} +Version: 9.0.2 +Release: 1%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -35,8 +35,8 @@ Patch4: %{name}-9.0.0-bat-build.patch Patch5: %{name}-9.0.0-seg-fault.patch Patch6: %{name}-5.2.13-logwatch.patch Patch7: %{name}-9.0.0-non-free-code.patch -Patch8: %{name}-9.0.0-tray-monitor-desktop.patch -Patch9: %{name}-9.0.1-mariadb-reconnect.patch +# desktop-file-install not supported on RHEL 6 +Patch8: %{name}-9.0.2-desktop.patch # Original patch removed by mistake, upstream is not willing to add it again: # http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a @@ -319,7 +319,6 @@ Provides check_bacula support for Nagios. %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %patch10 -p1 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -395,23 +394,14 @@ rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so # Bat install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png -desktop-file-install \ - --dir=%{buildroot}%{_datadir}/applications \ - --remove-key=Encoding \ - --set-key=Categories --set-value="Utility;" \ - scripts/bat.desktop +install -p -m 644 -D scripts/bat.desktop %{buildroot}%{_datadir}/applications/bat.desktop # QT Tray monitor install -p -m 755 -D src/qt-console/tray-monitor/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor install -p -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf install -p -m 644 -D manpages/bacula-tray-monitor.1 %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1 install -p -m 644 -D bacula-tray-monitor.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png -desktop-file-install \ - --dir=%{buildroot}%{_datadir}/applications \ - --remove-key=Encoding \ - --set-key=Categories --set-value="Utility;" \ - --set-key=Icon --set-value="/usr/share/pixmaps/bacula-tray-monitor.png" \ - scripts/bacula-tray-monitor.desktop +install -p -m 644 -D scripts/bacula-tray-monitor.desktop %{buildroot}%{_datadir}/applications/bacula-tray-monitor.desktop # Logrotate mkdir -p %{buildroot}%{_localstatedir}/log/bacula @@ -734,6 +724,10 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Mon Jul 24 2017 Simone Caronni - 9.0.2-1 +- Update to 9.0.2. +- Update patches. + * Thu Jul 20 2017 Simone Caronni - 9.0.1-2 - Add patch to allow compilation on MariaDB 10.2. - Make only Fedora 27 require perl-interpreter.