- fix building with wxWidgets 3.0

[packages/bacula.git] / bacula.spec

diff --git a/bacula.spec b/bacula.spec
index c9ca009a0b0e4dbe5143d25809995e07149e544d..e643ccc74cedb93206e25d9e0403f43ac07cb9c8 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -32,7 +32,7 @@ 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
+Release:       4
 License:       AGPL v3
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
@@ -58,6 +58,7 @@ Patch3:               %{name}-desktop.patch
 Patch4:                make_catalog_backup-setup-home.patch
 Patch5:                %{name}-wx-console-build.patch
 Patch6:                %{name}-no_lockmgr.patch
+Patch7:                wxWidgets3.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -264,7 +265,7 @@ Group:              Networking/Utilities
 Requires(post):        sed >= 4.0
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      QtCore >= %{qtver}
-Obsoletes:     bacula-console-qt4 < %{version}-%{release}
+Obsoletes:     bacula-console-qt4 < 5.2.13-1
 
 %description console-qt
 Bacula - It comes by night and sucks the vital essence from your
@@ -464,6 +465,7 @@ Nagios plugin to check bacula.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -543,7 +545,7 @@ 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 \
@@ -839,6 +841,7 @@ 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)