From a6a727a67e12e317e980c2a694bccb249c319ee3 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 5 Mar 2020 11:45:51 +0100 Subject: [PATCH] Update installation steps --- bacula-install.patch | 73 ++++++++++++++++++++++++++++++++++++++++ bacula-tray-monitor.png | Bin 0 -> 2093 bytes bacula.spec | 20 ++++------- generic.xpm | 45 ------------------------- 4 files changed, 79 insertions(+), 59 deletions(-) create mode 100644 bacula-install.patch create mode 100644 bacula-tray-monitor.png delete mode 100644 generic.xpm diff --git a/bacula-install.patch b/bacula-install.patch new file mode 100644 index 0000000..8930034 --- /dev/null +++ b/bacula-install.patch @@ -0,0 +1,73 @@ +diff -Naur bacula-9.6.2.old/autoconf/configure.in bacula-9.6.2/autoconf/configure.in +--- bacula-9.6.2.old/autoconf/configure.in 2020-03-05 09:46:32.131750774 +0100 ++++ bacula-9.6.2/autoconf/configure.in 2020-03-05 09:47:33.786041438 +0100 +@@ -3498,11 +3498,11 @@ + 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/bacula-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/qt-console/tray-monitor/install_conf_file \ + src/dird/Makefile \ + src/dird/bacula-dir.conf \ + src/lib/Makefile \ +@@ -3609,6 +3609,8 @@ + + cd src/qt-console + chmod 755 install_conf_file build-depkgs-qt-console ++cd tray-monitor ++chmod 755 install_conf_file build-depkgs-qt-console + cd ${BUILD_DIR} + + cd scripts +diff -Naur bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in bacula-9.6.2/examples/nagios/check_bacula/Makefile.in +--- bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in 2020-03-05 09:46:32.128750711 +0100 ++++ bacula-9.6.2/examples/nagios/check_bacula/Makefile.in 2020-03-05 09:46:40.145918546 +0100 +@@ -72,7 +72,7 @@ + (cd $(srcdir); $(RMF) Makefile) + + install: all +- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula ++ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(sbindir)/check_bacula + + uninstall: + (cd $(DESTDIR)$(sbindir); $(RMF) check_bacula) +diff -Naur bacula-9.6.2.old/Makefile.in bacula-9.6.2/Makefile.in +--- bacula-9.6.2.old/Makefile.in 2020-03-05 09:46:32.135750858 +0100 ++++ bacula-9.6.2/Makefile.in 2020-03-05 09:46:40.146918567 +0100 +@@ -173,6 +173,8 @@ + done + (cd src/qt-console; \ + chmod 755 install_conf_file build-depkgs-qt-console) ++ (cd src/qt-console/tray-monitor; \ ++ chmod 755 install_conf_file build-depkgs-qt-console) + + clean: + @for I in ${all_subdirs} ; \ +diff -Naur bacula-9.6.2.old/src/qt-console/bat.pro.in bacula-9.6.2/src/qt-console/bat.pro.in +--- bacula-9.6.2.old/src/qt-console/bat.pro.in 2020-03-05 09:46:32.163751446 +0100 ++++ bacula-9.6.2/src/qt-console/bat.pro.in 2020-03-05 09:46:40.146918567 +0100 +@@ -12,7 +12,7 @@ + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + + bins.path = /$(DESTDIR)@sbindir@ +-bins.files = bat ++bins.files = .libs/bat + confs.path = /$(DESTDIR)@sysconfdir@ + confs.commands = ./install_conf_file + help.path = /$(DESTDIR)@htmldir@ +diff -Naur bacula-9.6.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-9.6.2/src/qt-console/tray-monitor/tray-monitor.pro.in +--- bacula-9.6.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2020-03-05 09:46:32.166751509 +0100 ++++ bacula-9.6.2/src/qt-console/tray-monitor/tray-monitor.pro.in 2020-03-05 09:46:40.146918567 +0100 +@@ -26,7 +26,7 @@ + + + bins.path = /$(DESTDIR)@sbindir@ +-bins.files = bacula-tray-monitor ++bins.files = .libs/bacula-tray-monitor + confs.path = /$(DESTDIR)@sysconfdir@ + confs.commands = ./install_conf_file + diff --git a/bacula-tray-monitor.png b/bacula-tray-monitor.png new file mode 100644 index 0000000000000000000000000000000000000000..8fd1972a8d95225020a9d9932aff4c978e48003e GIT binary patch literal 2093 zcmXX`3p|ti8{a`}GuN5xZkcRmX0zGGY_TjXmsvxpzuQS9bE!^8>3>jv9G7r#$Svhk zW2Hh=YDJ0a5S72`ppi(5N{XodzdHZ#=Y5~|d4KQoJm2s0JfF{-CHD2uft$l25QvVK zr@I6^UBBN@bzrO7(_TX$YCU3asSv!Ho10r$SeTianV6Uu8yh1H4Z)!!oo--Y0DNEp zbaizR2n2AzCsR{Xj-w+823b@J1*F(hsUTnH2lVyy{&8S1n3k3nh!=~+_7n<;7YcoXJO+cuV*g>Zv9Zz9)wQ;^249Vhj6h9< z_IKzY5Sp5rfJj3_15f~Lba(gl^##I2B9VuOhb@sP5D3;02ySj}JRXlurxS@pECxfN zP%sz_nM4AWK~2LS(9_eyqR|HW`al)%Su7T?K$61`U_hHxDv$~;Fa#h2jYh9ovj&i| z=yY#yZ#tC<8sxjUfbQ(bWP3Y1pdaw^`Fudl<#HJehKq{}PzwT_ot;5_OFW)rZ4KtB zudfgK1w6nK)~*FyP$(2k26PI5$KwGV7K;U8fDR}JxuE4s{ZB3^6g(#Ib5Nr^v z52~dF0s#((OQq6H9v;qYHV%gaJGydjs7WqAT~qVx-n{}o-`SBxqtP-CAKojA zi;IcbzICfaBH8BW=k4n1%HuJaOglR}uxKMB5=gAAs;WFzQBqh`nqO3Ow4fj>=g4or z9ZE=y-?4LN#LwG;f&%>gC1Cm@kvo_+mkUM>)_1A*LHn(~*2_0qE?#YFzN|RgQe9C| zUR+#OSX7jkmz|z|C@Cp<&oBGpp=6 zH`doT*40&3R2SqNO^S{GIV>zBATUBA2^NW5nM`LI%^Hs%P7*!?1Iphg@!bsh{AKaY z?3m`ti}CSi4S#yWRz5AvznY$!tP=9s>((OGzr3BFdowdL{rvf}ktaig_pjE~2|6U2JJqoT{!U$V}Z9V5k3e zW$ELGh4*h>Pfw~;s*$04Jw07Y<(0MzjpctHOiYkPM}_zqtu{Yig+MeiyxiTSTW;2u zME;6&GfgLoYX^);b|E99|3@V2j;Q>R?0 z@h4GZcPIr9Q=S&yRi(Vt2;cqf;M}zO-3{)x-;{Avwti_YomGNV?$U-VRr$St-5-9J z8kn@SxSt-HV%}Q+N2p8%-(YmN{!$CH0kK~10;}-W9&)28L&}1D?*GH*aE2g}J(r>&^ltw`^Qotk?G-JnpNzePKh00Vi{E zL$Kfi{(WU$!MSdkS))$K1R_VbdNv6g4I3xt$RB7Kvac@jNPa1?xC6QgrOls#&S&|YJh|rYOE@woS3AORQ)W=1A`B5O=)@>h z#s_FQ@adwJ)f@WK6W7I_>;Q3R;;`2gH8i2ZWecZ<*5HkpS!i?6N8RI6uNXH>U#GwTWFLKCEwM`RDiAZasHG zO;+{diEM`o)_qeyy&_gQ8RLg5&NS~Qo?#JM&&~`AN_Lb`2!7@s%{-a0rc_m$>IWLSO{bF}W@dKG`sSQhPIvTAZIN&{l?71DiB WEBL?$O&jpDgm?*k-J1kqhyMp%Q$+9p literal 0 HcmV?d00001 diff --git a/bacula.spec b/bacula.spec index 370b965..723c1f4 100644 --- a/bacula.spec +++ b/bacula.spec @@ -25,8 +25,7 @@ Source12: %{name}-sd.service Source15: %{name}-fd.sysconfig Source16: %{name}-dir.sysconfig Source17: %{name}-sd.sysconfig -# Image taken from http://www.bacula.org/git/cgit.cgi/bacula/plain/bacula/src/tray-monitor/generic.xpm -Source19: generic.xpm +Source19: https://salsa.debian.org/bacula-team/bacula/-/raw/master/debian/additions/bacula-tray-monitor.png#/bacula-tray-monitor.png Patch1: %{name}-openssl.patch Patch2: %{name}-queryfile.patch @@ -38,16 +37,15 @@ Patch7: %{name}-non-free-code.patch # desktop-file-install not supported on RHEL 6 Patch8: %{name}-desktop.patch Patch9: %{name}-g++-options.patch -# https://sources.debian.org/patches/bacula/9.4.1-1/upstream/add-libs3-checks/ Patch10: %{name}-s3-configure.patch Patch11: %{name}-ftbfs-f_type.patch - +Patch12: %{name}-install.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 # Without this, there is no library providing the correct shared object name # required by the daemons. # http://bugs.bacula.org/view.php?id=2084 -Patch12: %{name}-autoconf.patch +Patch13: %{name}-autoconf.patch BuildRequires: desktop-file-utils BuildRequires: perl-generators @@ -395,17 +393,14 @@ pushd src/qt-console/tray-monitor %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro %endif %make_build - cp -f .libs/bacula-tray-monitor . popd # Convert image to png for tray monitor icon -convert %{SOURCE19} bacula-tray-monitor.png - %install %make_install # Nagios plugin -install -p -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula +install -p -m 755 -D examples/nagios/check_bacula/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula # This will be managed through alternatives, as it requires the name to NOT # change between upgrades, so the versioned library name can not be used. @@ -419,11 +414,8 @@ install -p -m 644 -D scripts/bat.desktop %{buildroot}%{_datadir}/applications/ba install -p -m 755 -D src/qt-console/.libs/bat %{buildroot}%{_sbindir}/bat %endif -# 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 +install -p -m 644 -D %{SOURCE19} %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png install -p -m 644 -D scripts/bacula-tray-monitor.desktop %{buildroot}%{_datadir}/applications/bacula-tray-monitor.desktop # Logrotate @@ -731,7 +723,7 @@ fi %{_sbindir}/bat %files traymonitor -%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %attr(640,root,root) +%config(noreplace) %{_sysconfdir}/bacula/bacula-tray-monitor.conf %attr(640,root,root) %{_datadir}/applications/bacula-tray-monitor.desktop %{_datadir}/pixmaps/bacula-tray-monitor.png %{_mandir}/man1/bacula-tray-monitor.1* diff --git a/generic.xpm b/generic.xpm deleted file mode 100644 index 76e588d..0000000 --- a/generic.xpm +++ /dev/null @@ -1,45 +0,0 @@ -/* XPM */ -static const int xpm_generic_first_color = 6; -static const int xpm_generic_second_color = 7; -static const int xpm_generic_column = 5; -static const char* xpm_generic[]={ -"32 32 7 1", -". c None", -"# c #000000", -"a c #c0c0c0", -"b c #808080", -"c c #808000", -"d c #0000ff", -"e c #0000ff", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"....#########################...", -"...#aaaaaaaaaaaaaaaaaaaaaaaa##..", -"..#aaaaaaaaaaaaaaaaaaaaaaaaaa##.", -"..##aaaaaaaaaaaaaaaaaaaaaaaaa##.", -"..###########################b##", -"..##........................bb##", -"..##........................bb##", -"..##..aaaaaaaaaaaaaaaaaaaaaabb##", -"..##..aaabbbbbaaaaabbbbbaaaabb##", -"..##..aac.....baaac.....baaabb##", -"..##..ac..ddd..bac..eee..baabb##", -"..##..ac.ddddd.bac.eeeee.baabb##", -"..##..ac.ddddd.bac.eeeee.baabb##", -"..##..ac.ddddd.bac.eeeee.baabb##", -"..##..ac..ddd..bac..eee..baabb##", -"..##..aac.....baaac.....baaabb##", -"..##..aaacccccaaaaacccccaaaabb##", -"..##..aaaaaaaaaaaaaaaaaaaaaabb##", -"..##..aaaaaaaaaaaaaaaaaaaaaabb##", -"..##bbbbbbbbbbbbbbbbbbbbbbbbbbb.", -"....bbbbbbbbbbbbbbbbbbbbbbbbb#..", -".....########################...", -"......######################....", -"................................", -"................................"};