- up to 5.2.12

diff --git a/bacula-conf.patch b/bacula-conf.patch
index a3c117b7460fcaa5f00fa7014dfac100fd92cbe6..f34fba2f21bd4f056d7583902501dccd79da3cd4 100644 (file)
--- a/bacula-conf.patch
+++ b/bacula-conf.patch
@@ -1,7 +1,6 @@
-diff -urN bacula-2.2.6.org/src/dird/bacula-dir.conf.in bacula-2.2.6/src/dird/bacula-dir.conf.in
---- bacula-2.2.6.org/src/dird/bacula-dir.conf.in       2007-10-03 18:22:07.000000000 +0200
-+++ bacula-2.2.6/src/dird/bacula-dir.conf.in   2007-11-24 22:44:44.660275104 +0100
-@@ -231,8 +231,7 @@
+--- bacula-5.2.12/src/dird/bacula-dir.conf.in.orig     2012-09-13 10:51:19.000000000 +0200
++++ bacula-5.2.12/src/dird/bacula-dir.conf.in  2012-10-22 17:09:44.886778298 +0200
+@@ -230,8 +230,7 @@
  # Generic catalog service
  Catalog {
    Name = MyCatalog
@@ -11,21 +10,21 @@ diff -urN bacula-2.2.6.org/src/dird/bacula-dir.conf.in bacula-2.2.6/src/dird/bac
    dbname = "@db_name@"; dbuser = "@db_user@"; dbpassword = "@db_password@"
  }
  
-@@ -256,7 +256,7 @@
+@@ -261,7 +260,7 @@
  #          time to time as it will grow indefinitely. However, it will
  #          also keep all your messages if they scroll off the console.
  #
--  append = "@working_dir@/log" = all, !skipped
+-  append = "@logdir@/bacula.log" = all, !skipped
 +  append = "/var/log/bacula/log" = all, !skipped
    catalog = all
  }
  
-@@ -267,7 +267,7 @@
+@@ -273,7 +272,7 @@
    mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
    mail = @job_email@ = all, !skipped            
    console = all, !skipped, !saved
--  append = "@working_dir@/log" = all, !skipped
+-  append = "@logdir@/bacula.log" = all, !skipped
 +  append = "/var/log/bacula/log" = all, !skipped
  }
  
- 
+ # Default pool definition

diff --git a/bacula.spec b/bacula.spec
index 025d9d7b484675b102eb07f061f960cd76d5a9db..cd62b330efc8cf4d7561388262e6798a6e04ed26 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -26,15 +26,15 @@
 Summary:       Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
-Version:       5.2.6
-Release:       2
+Version:       5.2.12
+Release:       1
 License:       AGPL v3
 Group:         Networking/Utilities
-Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: 914483b92539598678542bd2ddb28043
-Source1:       http://downloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
-# Source1-md5: 30b340fefc46c8148b1ba89cd1db60e4
-Source2:       http://downloads.sourceforge.net/bacula/%{name}-rescue-5.0.1.tar.gz
+Source0:       http://dl.sourceforge.net/bacula/%{name}-%{version}.tar.gz
+# Source0-md5: b04c22b128b73359e4bbc9de06652c38
+Source1:       http://dl.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
+# Source1-md5: 909b85db6da2dbe6b1099688ad4ec7c3
+Source2:       http://dl.sourceforge.net/bacula/%{name}-rescue-5.0.1.tar.gz
 # Source2-md5: bb194aed8e204f54bf2f61d7e721f257
 Source10:      %{name}-dir.init
 Source11:      %{name}-fd.init
@@ -570,6 +570,7 @@ sed -e 's/gnome-console/wx-console/g;s/Console/Wx Console/g' \
 # qmake somewhy does not always create install_bins target. install our own the bin
 rm -f $RPM_BUILD_ROOT%{_sbindir}/bat
 libtool --silent --mode=install install src/qt-console/bat $RPM_BUILD_ROOT%{_bindir}
+cp -a scripts/bacula.png $RPM_BUILD_ROOT%{_pixmapsdir}/bacula.png
 cp -a scripts/bat.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif