rpms/bacula/F-13 bacula-5.0.2-config.patch, NONE, 1.1 bacula.spec, 1.41, 1.42

Thu Jun 3 10:57:32 UTC 2010

Author: jgorig

Update of /cvs/pkgs/rpms/bacula/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6989

Modified Files:
	bacula.spec 
Added Files:
	bacula-5.0.2-config.patch 
Log Message:
#593307, #575425, #537250, #556480 


bacula-5.0.2-config.patch:
 bacula-dir.conf.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bacula-5.0.2-config.patch ---
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


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- bacula.spec	1 Jun 2010 19:40:32 -0000	1.41
+++ bacula.spec	3 Jun 2010 10:57:32 -0000	1.42
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 5.0.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -25,7 +25,8 @@ Source9: bacula-sd.init
 #Source10: http://download.sourceforge.net/bacula/bacula-gui-%{gui_version}.tar.gz
 #Source11: bacula-web.apache
 Source12: bacula-bat.desktop
-Source13: bacula-traymonitor.desktop.consolehelper
+Source13: bacula-traymonitor.console_apps
+Source14: bacula-wxconsole.console_apps
 Patch0: bacula-director-configuration.patch
 Patch1: bacula-config.patch
 #Patch2: bacula-wxconsole.patch
@@ -42,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
@@ -53,12 +55,7 @@ BuildRequires: mysql-devel, cdrecord, po
 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,
@@ -229,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
 
@@ -295,18 +291,6 @@ This package contains the wxWidgets vers
 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
@@ -371,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
@@ -396,7 +381,7 @@ mkdir bacula-mysql bacula-postgresql bac
 # 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 \
@@ -441,7 +426,7 @@ if test $? != 0; then 
   exit 1
 fi
 
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} NO_ECHO=
 
 }				
 
@@ -581,18 +566,18 @@ install -m 644 -D bacula-sqlite/scripts/
 #install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bgnome-console
 #install -m 644 -D bacula-sqlite/scripts/bgnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bgnome-console
 install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
-install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
-install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
+install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/bwxconsole
+install -m 644 -D %{SOURCE14} %{buildroot}%{_sysconfdir}/security/console.apps/bwxconsole
 #bat.pamd is broken.
 install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
-install -m 644 -D bacula-sqlite/scripts/bat.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/bat
+install -m 644 -D bacula-sqlite/scripts/bat.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bat
 install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
 install -m 644 -D bacula-sqlite/src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
 install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bacula-tray-monitor
 install -m 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/security/console.apps/bacula-tray-monitor
 
 #ln -sf consolehelper %{buildroot}%{_bindir}/bgnome-console
-ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
+ln -sf consolehelper %{buildroot}%{_bindir}/bwxconsole
 ln -sf consolehelper %{buildroot}%{_bindir}/bat
 ln -sf consolehelper %{buildroot}%{_bindir}/bacula-tray-monitor
 install -m 755 bacula-sqlite/src/qt-console/bat %{buildroot}%{_sbindir}
@@ -792,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
@@ -862,10 +841,10 @@ fi
 
 %files console-wxwidgets
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/security/console.apps/wxconsole
-%config %{_sysconfdir}/pam.d/wxconsole
+%config %{_sysconfdir}/security/console.apps/bwxconsole
+%config %{_sysconfdir}/pam.d/bwxconsole
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bwxconsole.conf
-%{_bindir}/wxconsole
+%{_bindir}/bwxconsole
 %{_sbindir}/bwxconsole
 %{_mandir}/man1/bacula-bwxconsole.1*
 %{_datadir}/applications/fedora-bacula-wxconsole.desktop
@@ -1021,6 +1000,17 @@ fi
 
 
 %changelog
+* Thu Jun 3 2010 Jan Görig <jgorig at 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 at redhat.com> 5.0.2-4
+- initscripts improvements
+- fixed consolehelper settings and menu entries
+
 * Tue Jun 01 2010 Jon Ciesla <limb at jcomserv.net - 5.0.2-3
 - Corrected ssl patch, court. jgorig.
 

