- up to 5.2.2; rel 1; WARNING: incompatible with 5.0, needs conversion

Changed files:
    bacula-conf.patch -> 1.6
    bacula-wxconsole.patch -> 1.2
    bacula.spec -> 1.188

diff --git a/bacula-conf.patch b/bacula-conf.patch
index 9256bc9c7a7493fe3df037cbbe083bfaf66c5c43..a3c117b7460fcaa5f00fa7014dfac100fd92cbe6 100644 (file)
--- a/bacula-conf.patch
+++ b/bacula-conf.patch
@@ -6,7 +6,7 @@ diff -urN bacula-2.2.6.org/src/dird/bacula-dir.conf.in bacula-2.2.6/src/dird/bac
  Catalog {
    Name = MyCatalog
 -# Uncomment the following line if you want the dbi driver
--@uncomment_dbi@ dbdriver = "dbi:@DB_TYPE@"; dbaddress = 127.0.0.1; dbport = @db_port@
+-@uncomment_dbi@ dbdriver = "dbi:@DEFAULT_DB_TYPE@"; dbaddress = 127.0.0.1; dbport = @db_port@
 +  dbdriver = "dbi:mysql"; dbaddress = 127.0.0.1; dbport = 3306
    dbname = "@db_name@"; dbuser = "@db_user@"; dbpassword = "@db_password@"
  }

diff --git a/bacula-wxconsole.patch b/bacula-wxconsole.patch
deleted file mode 100644 (file)
index f5403e1..0000000
--- a/bacula-wxconsole.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- bacula-5.2.1/src/wx-console/console_thread.cpp.org 2011-11-01 21:39:04.664311911 +0100
-+++ bacula-5.2.1/src/wx-console/console_thread.cpp     2011-11-01 21:52:51.874066263 +0100
-@@ -483,7 +483,7 @@
-          csprint(UA_sock->msg);
-       }
-       else if (stat == BNET_SIGNAL) {
--         if (UA_sock->msglen == BNET_PROMPT) {
-+         if (UA_sock->msglen == BNET_SUB_PROMPT) {
-             csprint(NULL, CS_PROMPT);
-          } else if (UA_sock->msglen == BNET_EOD) {
-             last_is_eod = 1;
-@@ -534,7 +534,7 @@
-    if (UA_sock) {
-       UA_sock->msglen = (int32_t)strlen(str);
-       pm_strcpy(&UA_sock->msg, str);
--      UA_sock->_send();
-+      UA_sock->send();
-    } else if (choosingdirector) {
- //      wxString number = str;
- //      number.RemoveLast(); /* Removes \n */

diff --git a/bacula.spec b/bacula.spec
index d4e1e323975b393e49fa84bb2db1dd849439de59..121c4cb09eb357df964a94b6073bea7ba535c0db 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -22,14 +22,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.1
-Release:       0.1
+Version:       5.2.2
+Release:       1
 License:       AGPL v3
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: 793da9f89fc5e024b6b95eb16a3120e5
+# Source0-md5: 227b88f56ae085da8f48823b220d4c87
 Source1:       http://downloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
-# Source1-md5: d4db495def9e7843bcca8aff2d4d493b
+# Source1-md5: 478273c0229f24d6690fdbedbeb50fa4
 Source2:       http://downloads.sourceforge.net/bacula/%{name}-rescue-5.0.1.tar.gz
 # Source2-md5: bb194aed8e204f54bf2f61d7e721f257
 Source10:      %{name}-dir.init
@@ -45,7 +45,6 @@ Patch2:               %{name}-conf.patch
 Patch3:                %{name}-desktop.patch
 Patch4:                make_catalog_backup-setup-home.patch
 Patch5:                %{name}-mysql_thread.patch
-Patch6:                %{name}-wxconsole.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -444,7 +443,6 @@ Nagios plugin to check bacula.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -482,6 +480,7 @@ QMAKE=%{_bindir}/qt4-qmake \
        --with-smtp-host=localhost \
        --with-pid-dir=/var/run \
        --with-subsys-dir=/var/lock/subsys \
+       --with-systemd=/lib/systemd/system \
        --enable-batch-insert \
        %{?with_pgsql:--with-postgresql} \
        %{?with_mysql:--with-mysql} \
@@ -812,6 +811,8 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \
 %attr(755,root,root) %{_sbindir}/bacula-dbcheck
 %{_mandir}/man8/bacula-dir.8*
 %{_mandir}/man8/bacula-dbcheck.8*
+%{_mandir}/man8/bregex.8*
+%{_mandir}/man8/bwild.8*
 %{_libexecdir}/%{name}/query.sql
 %attr(755,root,root) %{_libexecdir}/%{name}/delete_catalog_backup