Update git patch.
This commit is contained in:
Simone Caronni
parent
5fc992fd8b
commit
2354547b11
16223
bacula-7.0.0-git.patch
16223
bacula-7.0.0-git.patch
File diff suppressed because it is too large
Load Diff
182
bacula.spec
182
bacula.spec
@ -3,7 +3,7 @@
|
||||
|
||||
Name: bacula
|
||||
Version: 7.0.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?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
|
||||
Patch9: %{name}-non-free-code.patch
|
||||
Patch10: %{name}-7.0.0-configure.patch
|
||||
Patch11: %{name}-7.0.0-git.patch
|
||||
Patch7: %{name}-non-free-code.patch
|
||||
Patch8: %{name}-7.0.0-configure.patch
|
||||
Patch9: %{name}-7.0.0-git.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: perl
|
||||
@ -295,15 +295,15 @@ Provides check_bacula support for Nagios.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p2 -b .openssl
|
||||
%patch2 -p1 -b .queryfile
|
||||
%patch3 -p0 -b .priv
|
||||
%patch4 -p1 -b .bat-build
|
||||
%patch5 -p1 -b .seg-fault
|
||||
%patch6 -p1 -b .logwatch
|
||||
%patch9 -p1 -b .non-free-code
|
||||
%patch10 -p1 -b .configure
|
||||
%patch11 -p2 -b .git
|
||||
%patch1 -p2
|
||||
%patch2 -p1
|
||||
%patch3 -p0
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p2
|
||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
|
||||
|
||||
# Remove execution permissions from files we're packaging as docs later on
|
||||
@ -314,40 +314,40 @@ build() {
|
||||
export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
|
||||
export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
|
||||
%configure \
|
||||
--disable-conio \
|
||||
--disable-rpath \
|
||||
--docdir=%{_datadir}/bacula \
|
||||
--enable-batch-insert \
|
||||
--enable-build-dird \
|
||||
--enable-build-stored \
|
||||
--enable-includes \
|
||||
--enable-largefile \
|
||||
--enable-readline \
|
||||
--enable-smartalloc \
|
||||
--sysconfdir=%{_sysconfdir}/bacula \
|
||||
--with-hostname=localhost \
|
||||
--with-basename=bacula \
|
||||
--with-bsrdir=%{_localstatedir}/spool/bacula \
|
||||
--with-dir-password=@@DIR_PASSWORD@@ \
|
||||
--with-fd-password=@@FD_PASSWORD@@ \
|
||||
--with-sd-password=@@SD_PASSWORD@@ \
|
||||
--with-hostname=localhost \
|
||||
--with-logdir=%{_localstatedir}/log/bacula \
|
||||
--with-mon-dir-password=@@MON_DIR_PASSWORD@@ \
|
||||
--with-mon-fd-password=@@MON_FD_PASSWORD@@ \
|
||||
--with-mon-sd-password=@@MON_SD_PASSWORD@@ \
|
||||
--with-working-dir=%{_localstatedir}/spool/bacula \
|
||||
--with-bsrdir=%{_localstatedir}/spool/bacula \
|
||||
--with-logdir=%{_localstatedir}/log/bacula \
|
||||
--with-scriptdir=%{_libexecdir}/bacula \
|
||||
--with-plugindir=%{_libdir}/bacula \
|
||||
--with-smtp-host=localhost \
|
||||
--with-subsys-dir=%{_localstatedir}/lock/subsys \
|
||||
--with-pid-dir=%{_localstatedir}/run \
|
||||
--disable-conio \
|
||||
--enable-batch-insert \
|
||||
--enable-includes \
|
||||
--enable-readline \
|
||||
--enable-largefile \
|
||||
--enable-build-dird \
|
||||
--enable-build-stored \
|
||||
--with-openssl \
|
||||
--with-tcp-wrappers \
|
||||
--with-python \
|
||||
--enable-smartalloc \
|
||||
--with-x \
|
||||
--disable-rpath \
|
||||
--with-sqlite3 \
|
||||
--with-mysql \
|
||||
--with-openssl \
|
||||
--with-pid-dir=%{_localstatedir}/run \
|
||||
--with-plugindir=%{_libdir}/bacula \
|
||||
--with-postgresql \
|
||||
--docdir=%{_datadir}/bacula \
|
||||
--with-python \
|
||||
--with-scriptdir=%{_libexecdir}/bacula \
|
||||
--with-sd-password=@@SD_PASSWORD@@ \
|
||||
--with-smtp-host=localhost \
|
||||
--with-sqlite3 \
|
||||
--with-subsys-dir=%{_localstatedir}/lock/subsys \
|
||||
--with-tcp-wrappers \
|
||||
--with-working-dir=%{_localstatedir}/spool/bacula \
|
||||
--with-x \
|
||||
$*
|
||||
}
|
||||
|
||||
@ -382,10 +382,6 @@ make install DESTDIR=%{buildroot}
|
||||
# Nagios plugin
|
||||
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
|
||||
install -p -m 644 -D manpages/bpluginfo.8 %{buildroot}%{_mandir}/man8/bpluginfo.8
|
||||
|
||||
# Remove catalogue backend symlinks
|
||||
rm -f %{buildroot}%{_libdir}/libbaccats.so
|
||||
rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
|
||||
@ -402,6 +398,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
|
||||
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
|
||||
install -p -m 644 -D manpages/bacula-tray-monitor.1 %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
|
||||
|
||||
%else
|
||||
@ -447,7 +444,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-tray-monitor.1*
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 6
|
||||
rm -f %{buildroot}%{_datadir}/bacula/{ChangeLog,INSTALL,LICENSE,README,ReleaseNotes,VERIFYING,technotes}
|
||||
@ -605,44 +601,27 @@ fi
|
||||
%defattr(-,root,root,-)
|
||||
%doc README.Redhat quickstart_*
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/bacula
|
||||
%attr(755,root,root) %dir %{_sysconfdir}/%{name}
|
||||
%dir %{_localstatedir}/log/bacula %attr(750, bacula, bacula)
|
||||
%dir %{_localstatedir}/spool/bacula %attr(750, bacula, bacula)
|
||||
%dir %{_libexecdir}/%{name}
|
||||
%{_sbindir}/btraceback
|
||||
%{_sbindir}/bpluginfo
|
||||
%dir %{_sysconfdir}/%{name} %attr(755,root,root)
|
||||
%{_libexecdir}/%{name}/btraceback.dbx
|
||||
%{_libexecdir}/%{name}/btraceback.gdb
|
||||
%{_libexecdir}/%{name}/bacula_config
|
||||
%{_libexecdir}/%{name}/btraceback.mdb
|
||||
%{_mandir}/man8/btraceback.8*
|
||||
%{_mandir}/man8/bpluginfo.8*
|
||||
%dir %attr(750, bacula, bacula) %{_localstatedir}/log/bacula
|
||||
%dir %attr(750, bacula, bacula) %{_localstatedir}/spool/bacula
|
||||
%{_sbindir}/btraceback
|
||||
%{_sbindir}/bpluginfo
|
||||
|
||||
%files director
|
||||
%defattr(-,root,root,-)
|
||||
%doc updatedb examples/sample-query.sql
|
||||
%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf
|
||||
%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/query.sql
|
||||
%config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf %attr(640,root,bacula)
|
||||
%config(noreplace) %{_sysconfdir}/bacula/query.sql %attr(640,root,bacula)
|
||||
%config(noreplace) %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
|
||||
%config(noreplace) %{_sysconfdir}/logwatch/conf/services/bacula.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/bacula-dir
|
||||
%{_sysconfdir}/logwatch/scripts/services/bacula
|
||||
%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%{_unitdir}/bacula-dir.service
|
||||
%else
|
||||
%{_initrddir}/bacula-dir
|
||||
%endif
|
||||
%{_sbindir}/bacula-dir
|
||||
%{_sbindir}/bregex
|
||||
%{_sbindir}/bsmtp
|
||||
%{_sbindir}/bwild
|
||||
%{_sbindir}/dbcheck
|
||||
%{_mandir}/man1/bsmtp.1*
|
||||
%{_mandir}/man8/bacula-dir.8*
|
||||
%{_mandir}/man8/bregex.8*
|
||||
%{_mandir}/man8/bwild.8*
|
||||
%{_mandir}/man8/dbcheck.8*
|
||||
%{_libexecdir}/%{name}/create_bacula_database
|
||||
%{_libexecdir}/%{name}/delete_catalog_backup
|
||||
%{_libexecdir}/%{name}/drop_bacula_database
|
||||
@ -669,22 +648,28 @@ fi
|
||||
%{_libexecdir}/%{name}/grant_postgresql_privileges
|
||||
%{_libexecdir}/%{name}/make_postgresql_tables
|
||||
%{_libexecdir}/%{name}/update_postgresql_tables
|
||||
%{_mandir}/man1/bsmtp.1*
|
||||
%{_mandir}/man8/bacula-dir.8*
|
||||
%{_mandir}/man8/bregex.8*
|
||||
%{_mandir}/man8/bwild.8*
|
||||
%{_mandir}/man8/dbcheck.8*
|
||||
%{_sbindir}/bacula-dir
|
||||
%{_sbindir}/bregex
|
||||
%{_sbindir}/bsmtp
|
||||
%{_sbindir}/bwild
|
||||
%{_sbindir}/dbcheck
|
||||
%{_sysconfdir}/logwatch/scripts/services/bacula
|
||||
%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%{_unitdir}/bacula-dir.service
|
||||
%else
|
||||
%{_initrddir}/bacula-dir
|
||||
%endif
|
||||
|
||||
%files storage
|
||||
%defattr(-,root,root,-)
|
||||
%{_sbindir}/bacula-sd
|
||||
%{_sbindir}/bcopy
|
||||
%{_sbindir}/bextract
|
||||
%{_sbindir}/bls
|
||||
%{_sbindir}/bscan
|
||||
%{_sbindir}/btape
|
||||
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
|
||||
%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf %attr(640,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%{_unitdir}/bacula-sd.service
|
||||
%else
|
||||
%{_initrddir}/bacula-sd
|
||||
%endif
|
||||
%{_libexecdir}/%{name}/disk-changer
|
||||
%{_libexecdir}/%{name}/dvd-handler
|
||||
%{_libexecdir}/%{name}/mtx-changer
|
||||
@ -695,43 +680,56 @@ fi
|
||||
%{_mandir}/man8/bls.8*
|
||||
%{_mandir}/man8/bscan.8*
|
||||
%{_mandir}/man8/btape.8*
|
||||
%{_sbindir}/bacula-sd
|
||||
%{_sbindir}/bcopy
|
||||
%{_sbindir}/bextract
|
||||
%{_sbindir}/bls
|
||||
%{_sbindir}/bscan
|
||||
%{_sbindir}/btape
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%{_unitdir}/bacula-sd.service
|
||||
%else
|
||||
%{_initrddir}/bacula-sd
|
||||
%endif
|
||||
|
||||
|
||||
%files client
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf %attr(640,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
|
||||
%{_mandir}/man8/bacula-fd.8*
|
||||
%{_libdir}/bacula/bpipe-fd.so
|
||||
%{_sbindir}/bacula-fd
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%{_unitdir}/bacula-fd.service
|
||||
%else
|
||||
%{_initrddir}/bacula-fd
|
||||
%endif
|
||||
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
|
||||
%{_mandir}/man8/bacula-fd.8*
|
||||
%{_libdir}/bacula/bpipe-fd.so
|
||||
|
||||
%files console
|
||||
%defattr(-,root,root,-)
|
||||
%{_sbindir}/bconsole
|
||||
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
|
||||
%config(noreplace) %{_sysconfdir}/bacula/bconsole.conf %attr(640,root,root)
|
||||
%{_mandir}/man8/bconsole.8*
|
||||
%{_sbindir}/bconsole
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 6
|
||||
%files console-bat
|
||||
%defattr(-,root,root,-)
|
||||
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
|
||||
%{_sbindir}/bat
|
||||
%{_mandir}/man1/bat.1*
|
||||
%config(noreplace) %{_sysconfdir}/bacula/bat.conf %attr(640,root,root)
|
||||
%{_datadir}/applications/bacula-bat.desktop
|
||||
%{_datadir}/bacula/*.html
|
||||
%{_datadir}/bacula/*.png
|
||||
%{_datadir}/pixmaps/bat.png
|
||||
%{_mandir}/man1/bat.1*
|
||||
%{_sbindir}/bat
|
||||
|
||||
%files traymonitor
|
||||
%defattr(-,root,root,-)
|
||||
%{_sbindir}/bacula-tray-monitor
|
||||
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
|
||||
%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %attr(640,root,root)
|
||||
%{_datadir}/applications/bacula-traymonitor.desktop
|
||||
%{_datadir}/pixmaps/bacula-tray-monitor.png
|
||||
%{_mandir}/man1/bacula-tray-monitor.1*
|
||||
%{_sbindir}/bacula-tray-monitor
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
@ -748,6 +746,10 @@ fi
|
||||
%{_libdir}/nagios/plugins/check_bacula
|
||||
|
||||
%changelog
|
||||
* Sun Mar 30 2014 Simone Caronni <negativo17@gmail.com> - 7.0.0-3
|
||||
- Update git patch.
|
||||
- Sort file sections.
|
||||
|
||||
* 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.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user