- updated to 5.2.13

- TLDized

diff --git a/bacula-branding.patch b/bacula-branding.patch
index 76061c741a2f52d454333def0068cc5c1b99024a..f24961b6a61afec601f5edfdaaa77e63f7c496c1 100644 (file)
--- a/bacula-branding.patch
+++ b/bacula-branding.patch
@@ -1,16 +1,15 @@
 diff -urN bacula-2.2.6.org/autoconf/configure.in bacula-2.2.6/autoconf/configure.in
 --- bacula-2.2.6.org/autoconf/configure.in     2007-10-24 20:37:02.000000000 +0200
 +++ bacula-2.2.6/autoconf/configure.in 2007-11-24 22:01:38.010721290 +0100
-@@ -2094,6 +2094,13 @@
+@@ -2094,6 +2094,12 @@
    ;;
  esac  
  
-+# force PLD branding
-+DISTNAME="PLD/Linux"
-+DISTVER=$(awk ' { print $1 " " $4  } ' /etc/pld-release 2> /dev/null)
++# force TLD branding
++DISTNAME="TLD/Linux"
++DISTVER=$(awk '{ print $3 }' /etc/tld-release 2> /dev/null)
 +TAPEDRIVE="/dev/nst0"
 +PSCMD="ps -e -o pid,command"
-+
 +
  AC_SUBST(hostname)
  

diff --git a/bacula-conf.patch b/bacula-conf.patch
index a3c117b7460fcaa5f00fa7014dfac100fd92cbe6..6ee1e71ba322ad88846db4d7a5259b9cb0b49357 100644 (file)
--- a/bacula-conf.patch
+++ b/bacula-conf.patch
@@ -15,8 +15,8 @@ diff -urN bacula-2.2.6.org/src/dird/bacula-dir.conf.in bacula-2.2.6/src/dird/bac
  #          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 = "/var/log/bacula/log" = all, !skipped
+-  append = "@logdir@/bacula.log" = all, !skipped
++  append = "@logdir@/log" = all, !skipped
    catalog = all
  }
  
@@ -24,8 +24,8 @@ diff -urN bacula-2.2.6.org/src/dird/bacula-dir.conf.in bacula-2.2.6/src/dird/bac
    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 = "/var/log/bacula/log" = all, !skipped
+-  append = "@logdir@/bacula.log" = all, !skipped
++  append = "@logdir@/log" = all, !skipped
  }
  
  

diff --git a/bacula.spec b/bacula.spec
index 025d9d7b484675b102eb07f061f960cd76d5a9db..0d6a994df11a9a48ad89038f6c0ece03d25fb5b6 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -4,12 +4,8 @@
 #      - check on upgrade (5.0 and 5.2 databases are NOT compatible)
 #
 # Conditional build:
-%bcond_without console_wx              # wx-console program
-%if "%{pld_release}" == "ac"
-%bcond_with            bat                     # bat Qt4 GUI
-%else
+%bcond_with    console_wx              # wx-console program
 %bcond_without bat                     # bat Qt4 GUI
-%endif
 %bcond_without mysql                   # use MySQL
 %bcond_without pgsql                   # use PostgreSQL
 %bcond_without sqlite3                 # use SQLite3
@@ -26,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.6
-Release:       2
+Version:       5.2.13
+Release:       1
 License:       AGPL v3
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: 914483b92539598678542bd2ddb28043
+# Source0-md5: 43417bae0c221afb1f30a581c9e0f2fe
 Source1:       http://downloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
-# Source1-md5: 30b340fefc46c8148b1ba89cd1db60e4
+# Source1-md5: 0e7af41cc3b1c59662457679b02bf873
 Source2:       http://downloads.sourceforge.net/bacula/%{name}-rescue-5.0.1.tar.gz
 # Source2-md5: bb194aed8e204f54bf2f61d7e721f257
 Source10:      %{name}-dir.init
@@ -482,6 +478,7 @@ QMAKE=%{_bindir}/qt4-qmake \
        --with-dump-email="root@localhost" \
        --with-job-email="root@localhost" \
        --with-smtp-host=localhost \
+       --with-logdir=/var/log/bacula \
        --with-pid-dir=/var/run \
        --with-subsys-dir=/var/lock/subsys \
        --with-systemd=/lib/systemd/system \
@@ -570,6 +567,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
 
@@ -807,7 +805,7 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \
 
 %files dir
 %defattr(644,root,root,755)
-%doc ChangeLog CheckList ReleaseNotes kernstodo LICENSE
+%doc ChangeLog CheckList ReleaseNotes LICENSE
 #%doc examples %{name}-docs-%{version}/manual/{*.pdf,bacula}
 %attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bacula-dir.conf
 %ghost %{_sysconfdir}/.pw.sed