[bacula/f16] Change query file patch
Simone Caronni
slaanesh at fedoraproject.org
Fri Dec 23 10:21:57 UTC 2011
commit f0a462ebcc73fd1d546ac2e3ade71527b86bfa8a
Author: Simone Caronni <negativo17 at gmail.com>
Date: Fri Dec 23 11:21:40 2011 +0100
Change query file patch
bacula-5.0.2-config.patch | 12 ------------
bacula-5.0.3-queryfile.patch | 12 ++++++++++++
bacula.spec | 5 +++--
3 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/bacula-5.0.3-queryfile.patch b/bacula-5.0.3-queryfile.patch
new file mode 100644
index 0000000..dda6598
--- /dev/null
+++ b/bacula-5.0.3-queryfile.patch
@@ -0,0 +1,12 @@
+diff -up bacula-5.0.3.old/src/dird/bacula-dir.conf.in.config bacula-5.0.3/src/dird/bacula-dir.conf.in
+--- bacula-5.0.3.old/src/dird/bacula-dir.conf.in.config 2010-06-03 11:05:07.000000000 +0200
++++ bacula-5.0.3/src/dird/bacula-dir.conf.in 2010-06-03 11:28:26.556782993 +0200
+@@ -15,7 +15,7 @@
+ Director { # define myself
+ Name = bacula-dir
+ DIRport = @dir_port@ # where we listen for UA connections
+- QueryFile = "@scriptdir@/query.sql"
++ QueryFile = "@sysconfdir@/query.sql"
+ WorkingDirectory = "@working_dir@"
+ PidDirectory = "@piddir@"
+ Maximum Concurrent Jobs = 1
diff --git a/bacula.spec b/bacula.spec
index cc8f61c..98c26b4 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -25,7 +25,7 @@ Patch1: bacula-config.patch
Patch3: bacula-pamd.patch
Patch14: bacula-5.0.1-dsolink.patch
Patch15: bacula-5.0.2-openssl.patch
-Patch16: bacula-5.0.2-config.patch
+Patch16: bacula-5.0.3-queryfile.patch
Patch17: bacula-5.0.2-python27.patch
Patch18: bacula-5.0.3-dsolink.patch
Patch19: bacula-5.0.3-log-path.patch
@@ -331,7 +331,7 @@ pushd bacula-%{version}
%patch3 -p1
%patch14 -p2
%patch15 -p2 -b .openssl
-%patch16 -p2 -b .config
+%patch16 -p1 -b .queryfile
%patch17 -p0 -b .python27
%patch18 -p2 -b .dsolink
%patch19 -p2 -b .log-path
@@ -949,6 +949,7 @@ fi
- Enable readline support and tab completion in bconsole.
- Remove SQLite 2 support for RHEL 4.
- Add HTML docs.
+- Change SQL query file patch.
* Thu Dec 22 2011 Lukáš Nykrýn <lnykryn at redhat.com> - 5.0.3-14
- removed duplicity from logrotate file (#755970)
More information about the scm-commits
mailing list