- rel 2

[packages/bacula.git] / bacula.spec

diff --git a/bacula.spec b/bacula.spec
index 5bc6a41e3e7c351d860d90676ab6806c22d6595d..ca4a5029ece580cca29ce37f7ba0a59ec8904ad2 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -6,7 +6,11 @@
 #
 # Conditional build:
 %bcond_without console_wx              # wx-console program
+%if "%{pld_release}" == "ac"
+%bcond_with            bat                     # bat Qt4 GUI
+%else
 %bcond_without bat                     # bat Qt4 GUI
+%endif
 %bcond_without mysql                   # use MySQL
 %bcond_without pgsql                   # use PostgreSQL
 %bcond_without sqlite3                 # use SQLite3
@@ -23,14 +27,14 @@
 Summary:       Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
-Version:       5.2.2
-Release:       1
+Version:       5.2.5
+Release:       2
 License:       AGPL v3
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: 227b88f56ae085da8f48823b220d4c87
+# Source0-md5: 89bd0ecf7ce0afbb222f47a01fa9a370
 Source1:       http://downloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
-# Source1-md5: 478273c0229f24d6690fdbedbeb50fa4
+# Source1-md5: fbfb246c97ef653b9714268af4250035
 Source2:       http://downloads.sourceforge.net/bacula/%{name}-rescue-5.0.1.tar.gz
 # Source2-md5: bb194aed8e204f54bf2f61d7e721f257
 Source10:      %{name}-dir.init
@@ -45,7 +49,6 @@ Patch1:               %{name}-branding.patch
 Patch2:                %{name}-conf.patch
 Patch3:                %{name}-desktop.patch
 Patch4:                make_catalog_backup-setup-home.patch
-Patch5:                %{name}-mysql_thread.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -74,6 +77,7 @@ BuildRequires:        qt4-qmake >= %{qtver}
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: readline-devel
+BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
@@ -134,6 +138,7 @@ Conflicts:  bacula-console < 0:1.34.6
 Conflicts:     bacula-dir < 0:1.34.6
 Conflicts:     bacula-fd < 0:1.34.6
 Conflicts:     bacula-sd < 0:1.34.6
+Conflicts:     logrotate < 3.8.0
 
 %description common
 Bacula - It comes by night and sucks the vital essence from your
@@ -244,8 +249,8 @@ Summary:    Bacula Qt4 Console
 Summary(pl.UTF-8):     Konsola Baculi oparta na Qt4
 Group:         Networking/Utilities
 Requires(post):        sed >= 4.0
-Requires:      QtCore >= %{qtver}
 Requires:      %{name}-common = %{version}-%{release}
+Requires:      QtCore >= %{qtver}
 
 %description console-qt4
 Bacula - It comes by night and sucks the vital essence from your
@@ -443,7 +448,6 @@ Nagios plugin to check bacula.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -670,6 +674,11 @@ You have upgraded from an older version of Bacula director.
 
 You will probably need to call %{_libexecdir}/%{name}/update_bacula_tables
 script to upgrade the database.
+
+Ensure you database partition has enough free space before you run the upgrade,
+i.e check that there is enough room to rebuild 'File' table (it is the largest
+in bacula db).
+
 EOF
 
 %post dir