Backport fixes from git
This commit is contained in:
Simone Caronni
parent
af933fae4b
commit
230fff0672
20
bacula-7.0.0-configure.patch
Normal file
20
bacula-7.0.0-configure.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- bacula-7.0.0.old/configure 2014-03-29 10:00:03.000000000 +0100
|
||||
+++ bacula-7.0.0/configure 2014-03-30 12:10:44.275522112 +0200
|
||||
@@ -30888,7 +30888,7 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole 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/install_conf_file 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_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/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/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro 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_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"
|
||||
|
||||
@@ -32021,6 +32021,8 @@
|
||||
"src/qt-console/bat.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro" ;;
|
||||
"src/qt-console/bat.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro.mingw32" ;;
|
||||
"src/qt-console/install_conf_file") CONFIG_FILES="$CONFIG_FILES src/qt-console/install_conf_file" ;;
|
||||
+ "src/qt-console/tray-monitor/tray-monitor.conf") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.conf" ;;
|
||||
+ "src/qt-console/tray-monitor/tray-monitor.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.pro" ;;
|
||||
"src/dird/Makefile") CONFIG_FILES="$CONFIG_FILES src/dird/Makefile" ;;
|
||||
"src/dird/bacula-dir.conf") CONFIG_FILES="$CONFIG_FILES src/dird/bacula-dir.conf" ;;
|
||||
"src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
|
||||
2207
bacula-7.0.0-git.patch
Normal file
2207
bacula-7.0.0-git.patch
Normal file
File diff suppressed because it is too large
Load Diff
94
bacula.spec
94
bacula.spec
@ -3,7 +3,7 @@
|
||||
|
||||
Name: bacula
|
||||
Version: 7.0.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
|
||||
# See LICENSE for details
|
||||
License: AGPLv3 with exceptions
|
||||
@ -37,9 +37,9 @@ Patch3: %{name}-5.0.3-sqlite-priv.patch
|
||||
Patch4: %{name}-5.2.13-bat-build.patch
|
||||
Patch5: %{name}-5.2.12-seg-fault.patch
|
||||
Patch6: %{name}-5.2.13-logwatch.patch
|
||||
Patch7: %{name}-help-update.patch
|
||||
Patch8: %{name}-aarch64.patch
|
||||
Patch9: %{name}-non-free-code.patch
|
||||
Patch10: %{name}-7.0.0-configure.patch
|
||||
Patch11: %{name}-7.0.0-git.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: perl
|
||||
@ -258,18 +258,18 @@ based on a client/server architecture.
|
||||
|
||||
This package contains the bat version of the bacula management console.
|
||||
|
||||
#%package traymonitor
|
||||
#Summary: Bacula system tray monitor
|
||||
#Group: System Environment/Daemons
|
||||
#Requires: bacula-libs%{?_isa} = %{version}-%{release}
|
||||
%package traymonitor
|
||||
Summary: Bacula system tray monitor
|
||||
Group: System Environment/Daemons
|
||||
Requires: bacula-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
#%description traymonitor
|
||||
#Bacula is a set of programs that allow you to manage the backup, recovery, and
|
||||
#verification of computer data across a network of different computers. It is
|
||||
#based on a client/server architecture.
|
||||
%description traymonitor
|
||||
Bacula is a set of programs that allow you to manage the backup, recovery, and
|
||||
verification of computer data across a network of different computers. It is
|
||||
based on a client/server architecture.
|
||||
|
||||
#This package contains the Gnome and KDE compatible tray monitor to monitor your
|
||||
#bacula server.
|
||||
This package contains the Gnome and KDE compatible tray monitor to monitor your
|
||||
bacula server.
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
@ -285,13 +285,13 @@ based on a client/server architecture.
|
||||
|
||||
This development package contains static libraries and header files.
|
||||
|
||||
#%package -n nagios-plugins-bacula
|
||||
#Summary: Nagios Plugin - check_bacula
|
||||
#Group: Applications/System
|
||||
#Requires: bacula-libs%{?_isa} = %{version}-%{release}
|
||||
%package -n nagios-plugins-bacula
|
||||
Summary: Nagios Plugin - check_bacula
|
||||
Group: Applications/System
|
||||
Requires: bacula-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
#%description -n nagios-plugins-bacula
|
||||
#Provides check_bacula support for Nagios.
|
||||
%description -n nagios-plugins-bacula
|
||||
Provides check_bacula support for Nagios.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
@ -301,9 +301,9 @@ This development package contains static libraries and header files.
|
||||
%patch4 -p1 -b .bat-build
|
||||
%patch5 -p1 -b .seg-fault
|
||||
%patch6 -p1 -b .logwatch
|
||||
%patch7 -p1 -b .help-update
|
||||
%patch8 -p1 -b .aarch64
|
||||
%patch9 -p1 -b .non-free-code
|
||||
%patch10 -p1 -b .configure
|
||||
%patch11 -p2 -b .git
|
||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
|
||||
|
||||
# Remove execution permissions from files we're packaging as docs later on
|
||||
@ -364,23 +364,23 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
#pushd examples/nagios/check_bacula
|
||||
# CFLAGS="%{optflags}" make #LIBS="-lpthread -ldl -lssl -lcrypto -lz"
|
||||
#popd
|
||||
pushd examples/nagios/check_bacula
|
||||
CFLAGS="%{optflags}" make LIBS="-lpthread -ldl -lssl -lcrypto -lz"
|
||||
popd
|
||||
|
||||
#%if 0%{?fedora} || 0%{?rhel} >= 6
|
||||
#pushd src/qt-console/tray-monitor
|
||||
# #/usr/bin/qmake-qt4 tray-monitor.pro
|
||||
# make %{?_smp_mflags}
|
||||
#popd
|
||||
#%endif
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 6
|
||||
pushd src/qt-console/tray-monitor
|
||||
$QMAKE tray-monitor.pro
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
# 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/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
|
||||
|
||||
# Bacula plugin info utility
|
||||
install -p -m 755 -D src/tools/.libs/bpluginfo %{buildroot}%{_sbindir}/bpluginfo
|
||||
@ -399,10 +399,10 @@ install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
|
||||
|
||||
# QT Tray monitor
|
||||
#install -p -m 755 -D src/qt-console/tray-monitor/.libs/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 src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
|
||||
#desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
|
||||
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 src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
|
||||
|
||||
%else
|
||||
rm -f %{buildroot}%{_mandir}/man1/bat.1*
|
||||
@ -447,7 +447,6 @@ mkdir -p %{buildroot}%{_localstatedir}/spool/bacula
|
||||
rm -f %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql,bconsole,make_catalog_backup}
|
||||
rm -f %{buildroot}%{_sbindir}/bacula
|
||||
rm -f %{buildroot}%{_mandir}/man8/bacula.8.gz
|
||||
rm -f %{buildroot}%{_mandir}/man1/bacula-bwxconsole.1*
|
||||
rm -f %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1*
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 6
|
||||
@ -727,12 +726,12 @@ fi
|
||||
%{_datadir}/bacula/*.png
|
||||
%{_datadir}/pixmaps/bat.png
|
||||
|
||||
#%files traymonitor
|
||||
#%defattr(-,root,root,-)
|
||||
#%{_sbindir}/bacula-tray-monitor
|
||||
#%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
|
||||
#%{_datadir}/applications/bacula-traymonitor.desktop
|
||||
#%{_datadir}/pixmaps/bacula-tray-monitor.png
|
||||
%files traymonitor
|
||||
%defattr(-,root,root,-)
|
||||
%{_sbindir}/bacula-tray-monitor
|
||||
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
|
||||
%{_datadir}/applications/bacula-traymonitor.desktop
|
||||
%{_datadir}/pixmaps/bacula-tray-monitor.png
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
@ -744,11 +743,16 @@ fi
|
||||
%{_libdir}/libbacpy.so
|
||||
%{_libdir}/libbacsql.so
|
||||
|
||||
#%files -n nagios-plugins-bacula
|
||||
#%defattr(-,root,root)
|
||||
#%{_libdir}/nagios/plugins/check_bacula
|
||||
%files -n nagios-plugins-bacula
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/nagios/plugins/check_bacula
|
||||
|
||||
%changelog
|
||||
* Sun Mar 30 2014 Simone Caronni <negativo17@gmail.com> - 7.0.0-2
|
||||
- Backport changes from git for QT Tray monitor, Nagios plugin and configure
|
||||
script.
|
||||
- Removed upstream patches.
|
||||
|
||||
* Sun Mar 30 2014 Simone Caronni <negativo17@gmail.com> - 7.0.0-1
|
||||
- Update to 7.0.0.
|
||||
- Momentarily disable Nagios plugin and QT tray monitor as they don't build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user