From 7ce52f36a96885e6dc7ff745e873dcced4cdc81d Mon Sep 17 00:00:00 2001
From: Jan Görig <jgorig@fedoraproject.org>
Date: Jun 03 2010 09:57:02 +0000
Subject: #593307, #575425, #537250, #556480


---

diff --git a/bacula-5.0.2-config.patch b/bacula-5.0.2-config.patch
new file mode 100644
index 0000000..6859de4
--- /dev/null
+++ b/bacula-5.0.2-config.patch
@@ -0,0 +1,12 @@
+diff -up bacula-5.0.2/bacula-5.0.2/src/dird/bacula-dir.conf.in.config bacula-5.0.2/bacula-5.0.2/src/dird/bacula-dir.conf.in
+--- bacula-5.0.2/bacula-5.0.2/src/dird/bacula-dir.conf.in.config	2010-06-03 11:05:07.000000000 +0200
++++ bacula-5.0.2/bacula-5.0.2/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 = "/etc/bacula/query.sql"
+   WorkingDirectory = "@working_dir@"
+   PidDirectory = "@piddir@"
+   Maximum Concurrent Jobs = 1
diff --git a/bacula.spec b/bacula.spec
index cef3889..b48fea6 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 5.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -43,6 +43,7 @@ Patch3: bacula-pamd.patch
 #Patch13: bacula-3.0.2-openssl.patch
 Patch14: bacula-5.0.1-dsolink.patch
 Patch15: bacula-5.0.2-openssl.patch
+Patch16: bacula-5.0.2-config.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@@ -54,12 +55,7 @@ BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel
 BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed,
 BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript
 BuildRequires: dvipdfm, qwt-devel
-
-%if 0%{?fedora} >= 7
 BuildRequires: tcp_wrappers-devel
-%else
-BuildRequires: tcp_wrappers
-%endif
 
 %description
 Bacula is a set of programs that allow you to manage the backup,
@@ -230,7 +226,6 @@ mass storage devices.
 %package common
 Summary: Common Bacula utilities
 Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
 Requires(pre): fedora-usermgmt
 Obsoletes: bacula-console-gnome <= 3.0.3
 
@@ -296,18 +291,6 @@ This package contains the wxWidgets version of the bacula management
 console.
 
 
-%package sysconfdir
-Summary: /etc/bacula dependency for Bacula
-Group: System Environment/Daemons
-
-%description sysconfdir
-Bacula is a set of programs that allow you to manage the backup,
-recovery, and verification of computer data across a network of
-different computers. It is based on a client/server architecture.
-
-This package provides the /etc/bacula directory in order to satisfy
-certain scripted checks.
-
 %package traymonitor
 Summary: Bacula monitor for the Gnome and KDE system tray
 Group: System Environment/Daemons
@@ -372,6 +355,7 @@ pushd bacula-%{version}
 #%patch13 -p2 -b .openssl
 %patch14 -p2
 %patch15 -p2 -b .openssl
+%patch16 -p2 -b .config
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -397,7 +381,7 @@ mkdir bacula-mysql bacula-postgresql bacula-sqlite
 # Shell function to configure and build a Bacula tree
 build() {
 cp -rl ../bacula-%{version}/* .
-export CFLAGS=-I%{_includedir}/ncurses
+export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 export CPPFLAGS=-I%{_includedir}/ncurses
 export QMAKE=/usr/bin/qmake-qt4
 %configure \
@@ -442,7 +426,7 @@ if test $? != 0; then
   exit 1
 fi
 
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} NO_ECHO=
 
 }				
 
@@ -793,19 +777,13 @@ if [ "$1" -ge "1" ]; then
 fi
 
 
-# For this braindeadness, please see
-# https://bugzilla.redhat.com/show_bug.cgi?id=473627
-%files sysconfdir
-%defattr(-,root,root,-)
-%dir %{_sysconfdir}/bacula
-
-
 %files common
 %defattr(-,root,root,-)
 %doc bacula-%{version}/AUTHORS bacula-%{version}/ChangeLog bacula-%{version}/COPYING bacula-%{version}/LICENSE
 %doc bacula-%{version}/README bacula-%{version}/SUPPORT bacula-%{version}/VERIFYING
 %doc bacula-%{version}/examples/
 %config(noreplace) %{_sysconfdir}/logrotate.d/bacula
+%dir %{_sysconfdir}/bacula
 %dir %{_libexecdir}/bacula
 %{_sbindir}/bsmtp
 %{_sbindir}/btraceback
@@ -1022,6 +1000,13 @@ fi
 
 
 %changelog
+* Thu Jun 3 2010 Jan Görig <jgorig@redhat.com> 5.0.2-5
+- removed no longer needed sysconfig subpackage (#593307]
+- build with $RPM_OPT_FLAGS, show compiler commands in build log (#575425)
+  fixed by Ville Skyttä
+- dropped tcp_wrappers build conditional (#537250)
+- fixed location of query.xml in config file (#556480)
+
 * Wed Jun 2 2010 Jan Görig <jgorig@redhat.com> 5.0.2-4
 - initscripts improvements
 - fixed consolehelper settings and menu entries