X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bacula.spec;h=ca39a97bbf403346cd8b566890a3af9209641ae7;hb=53a3431c950dee6d37e948b5be97149ebf16e631;hp=95af94c1c671501530b3cf533bb0ada08a99183b;hpb=8186e042c50e6ecb92afe64b279024cd39bd1970;p=packages%2Fbacula.git

diff --git a/bacula.spec b/bacula.spec
index 95af94c..ca39a97 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,19 +2,15 @@
 #	- update desktop files, think about su-wrappers for console (with .desktop files)
 #	- package web admin
 #	- fix log file permissions
-#	- no longer builds:
-#make[1]: *** No rule to make target `../lib/libbac.la', needed by `bacula-dir'.  Stop.
-#make[1]: *** Waiting for unfinished jobs....
-#make[1]: Leaving directory `/home/users/glen/rpm/BUILD.x86_64-linux/bacula-5.0.2/src/dird'
 #
 # Conditional build:
 %bcond_without	console_wx		# wx-console program
+%bcond_without	console_gnome		# gnome console
 %bcond_without	bat			# bat Qt4 GUI
-%bcond_without	dbi			# use Database Independent Abstraction Layer (libdbi)
 %bcond_without	mysql			# use MySQL
 %bcond_without	pgsql			# use PostgreSQL
 %bcond_without	sqlite3			# use SQLite3
-%bcond_without	python
+%bcond_without	python		# Python Scripting support, http://www.bacula.org/3.0.x-manuals/en/concepts/concepts/Python_Scripting.html
 %bcond_without	nagios		# build nagios plugin
 %bcond_with	rescue
 %bcond_with	sqlite3_sync_off	# makes SQLite3 backend much faster, but less reliable
@@ -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.0.3
-Release:	6
-License:	extended GPL v2
+Version:	5.2.1
+Release:	0.1
+License:	AGPL v3
 Group:		Networking/Utilities
 Source0:	http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5:	9de254ae39cab0587fdb2f5d8d90b03b
+# Source0-md5:	793da9f89fc5e024b6b95eb16a3120e5
 Source1:	http://downloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
-# Source1-md5:	7a00557dcf0dfa40de9e74176fefd1ae
+# Source1-md5:	d4db495def9e7843bcca8aff2d4d493b
 Source2:	http://downloads.sourceforge.net/bacula/%{name}-rescue-5.0.1.tar.gz
 # Source2-md5:	bb194aed8e204f54bf2f61d7e721f257
 Source10:	%{name}-dir.init
@@ -44,23 +40,18 @@ Source14:	%{name}-dir.sysconfig
 Source15:	%{name}-fd.sysconfig
 Source16:	%{name}-sd.sysconfig
 Patch0:		%{name}-mtx-changer.patch
-Patch1:		%{name}-link.patch
-Patch2:		%{name}-tinfo-readline.patch
-Patch3:		%{name}-branding.patch
-Patch4:		%{name}-conf.patch
-Patch5:		%{name}-desktop.patch
-Patch7:		%{name}-dbi_fixes.patch
-Patch8:		%{name}-dbi_dbcheck.patch
-Patch9:		%{name}-openssl1.patch
-Patch10:	%{name}-dvd_rewind.patch
+Patch1:		%{name}-branding.patch
+Patch2:		%{name}-conf.patch
+Patch3:		%{name}-desktop.patch
+Patch4:		make_catalog_backup-setup-home.patch
+Patch5:		%{name}-mysql_thread.patch
 URL:		http://www.bacula.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel
+%{?with_console_wx:BuildRequires:	gtk+2-devel}
 BuildRequires:	libcap-devel
-%{?with_dbi:BuildRequires:	libdbi-devel >= 0.8.4}
 BuildRequires:	libtool >= 2:2.2
 %if %{with rescue}
 BuildRequires:	fakeroot
@@ -99,7 +90,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		nagiosplugindir	%{_libdir}/nagios/plugins
 
 # from 'the worst' to 'the best'
-%define	databases %{?with_dbi:dbi} %{?with_sqlite3:sqlite3} %{?with_mysql:mysql} %{?with_pgsql:postgresql}
+%define	databases %{?with_sqlite3:sqlite3} %{?with_mysql:mysql} %{?with_pgsql:postgresql}
 
 # dependency section is broken. ccache usage is instead to makefiles
 %undefine	with_ccache
@@ -395,21 +386,6 @@ SQLite database driver for Bacula.
 %description db-sqlite3 -l pl.UTF-8
 Sterownik bazy SQLite dla Baculi.
 
-%package db-dbi
-Summary:	libdbi database driver for Bacula
-Summary(pl.UTF-8):	Sterownik bazy libdbi dla Baculi
-Group:		Networking/Utilities
-Requires(post):	/sbin/ldconfig
-Requires:	%{name}-common = %{version}-%{release}
-Provides:	bacula(db) = %{version}-%{release}
-Obsoletes:	bacula(db)
-
-%description db-dbi
-libdbi database driver for Bacula.
-
-%description db-dbi -l pl.UTF-8
-Sterownik baz libdbi dla Baculi.
-
 %package rescue
 Summary:	Bacula - The Network Backup Solution
 Summary(pl.UTF-8):	Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
@@ -459,15 +435,11 @@ Nagios plugin to check bacula.
 %prep
 %setup -q -a 1
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -475,12 +447,7 @@ sed -i -e 's#bindir=.*#bindir=%{_bindir}#g' \
 	src/cats/create_* src/cats/delete_* src/cats/drop_* \
 	src/cats/grant_* src/cats/make_* src/cats/update_*
 sed -i -e 's/@hostname@/--hostname--/' src/*/*.conf.in
-
-%if %{with dbi}
-for dbtype in mysql postgresql sqlite3; do
-	sed -i -e "s,@DB_TYPE@,$dbtype,g" src/cats/*_${dbtype}_*
-done
-%endif
+sed -i -e 's/@basename@/--hostname--/' src/*/*.conf.in
 
 %build
 cd autoconf
@@ -492,46 +459,37 @@ cd ..
 
 CPPFLAGS="-I/usr/include/ncurses -I%{_includedir}/readline"
 
-# we wan't the 'base' build built with the last database in the list,
-# to make sure it is full-featured
-for database in %{databases}; do
-	WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
-	QMAKE=%{_bindir}/qt4-qmake \
-	%configure \
-		--with-scriptdir=%{_libexecdir}/%{name} \
-		%{?with_bat:--enable-bat} \
-		--disable-conio \
-		--enable-smartalloc \
-		%{?with_console_wx:--enable-bwx-console} \
-		--enable-tray-monitor \
-		%{?with_python:--with-python} \
-		--with-readline \
-		--with-tcp-wrappers \
-		--with-working-dir=%{_var}/lib/%{name} \
-		--with-dump-email="root@localhost" \
-		--with-job-email="root@localhost" \
-		--with-smtp-host=localhost \
-		--with-pid-dir=/var/run \
-		--with-subsys-dir=/var/lock/subsys \
-		--enable-batch-insert \
-		--with-$database \
-		%{?with_sqlite3_sync_off:--enable-extra-sqlite3-init="pragma synchronous=0;"} \
-		--with-dir-password="#FAKE-dir-password#" \
-		--with-fd-password="#FAKE-fd-password#" \
-		--with-sd-password="#FAKE-sd-password#" \
-		--with-mon-dir-password="#FAKE-mon-dir-password#" \
-		--with-mon-fd-password="#FAKE-mon-fd-password#" \
-		--with-mon-sd-password="#FAKE-mon-sd-password#" \
-		--with-openssl
-
-	# build the database library
-	%{__make} -C src/cats clean
-	%{__make} -C src/cats
-
-	# install the database library in a temporary location
-	install -d libbacsql/$database%{_libdir}
-	%{__make} -C src/cats libtool-install DESTDIR=$PWD/libbacsql/$database
-done
+WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
+QMAKE=%{_bindir}/qt4-qmake \
+%configure \
+	--with-scriptdir=%{_libexecdir}/%{name} \
+	%{?with_bat:--enable-bat} \
+	--disable-conio \
+	--enable-smartalloc \
+	%{?with_console_wx:--enable-bwx-console} \
+	%{?with_console_gnome:--enable-gnome} \
+	--enable-tray-monitor \
+	%{?with_python:--with-python} \
+	--with-readline \
+	--with-tcp-wrappers \
+	--with-working-dir=%{_var}/lib/%{name} \
+	--with-dump-email="root@localhost" \
+	--with-job-email="root@localhost" \
+	--with-smtp-host=localhost \
+	--with-pid-dir=/var/run \
+	--with-subsys-dir=/var/lock/subsys \
+	--enable-batch-insert \
+	%{?with_pgsql:--with-postgresql} \
+	%{?with_mysql:--with-mysql} \
+	%{?with_sqlite3:--with-sqlite3} \
+	%{?with_sqlite3_sync_off:--enable-extra-sqlite3-init="pragma synchronous=0;"} \
+	--with-dir-password="#FAKE-dir-password#" \
+	--with-fd-password="#FAKE-fd-password#" \
+	--with-sd-password="#FAKE-sd-password#" \
+	--with-mon-dir-password="#FAKE-mon-dir-password#" \
+	--with-mon-fd-password="#FAKE-mon-fd-password#" \
+	--with-mon-sd-password="#FAKE-mon-sd-password#" \
+	--with-openssl
 
 %if %{with bat}
 cd src/qt-console
@@ -563,22 +521,14 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_mandir},%{_bindir},/
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# install libraries for all the database backends
-# ldconfig will add the soname symlinks when one of the packages is installed
-for database in %{databases}; do
-	for libfile in libbacsql/$database%{_libdir}/lib*-*.so; do
-		orig_name=${libfile##*/}
-		file_prefix=${orig_name%%-*.so}
-		file_suffix=${orig_name#*-}
-		file_name=$file_prefix-$database-$file_suffix
-		install -p $libfile $RPM_BUILD_ROOT%{_libdir}/$file_name
-		touch $RPM_BUILD_ROOT%{_libdir}/$orig_name
-	done
-done
+# we use db dependant (at compile time) shell script only
+rm $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_catalog_backup.pl
+## dbi is not actual dbtype
+#rm $RPM_BUILD_ROOT%{_libexecdir}/%{name}/make_dbi_catalog_backup
 
-# replace with empty file, replaced by ldconfig from each db-* package on intsall
-rm -f $RPM_BUILD_ROOT%{_libdir}/libbacsql-%{version}.so
-touch $RPM_BUILD_ROOT%{_libdir}/libbacsql-%{version}.so
+## replace with empty file, replaced by ldconfig from each db-* package on intsall
+#rm $RPM_BUILD_ROOT%{_libdir}/libbaccats-%{version}.so
+#touch $RPM_BUILD_ROOT%{_libdir}/libbaccats-%{version}.so
 
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-dir
 install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-fd
@@ -601,9 +551,9 @@ sed -e 's/gnome-console/wx-console/g;s/Console/Wx Console/g' \
 %endif
 
 %if %{with bat}
-%{__make} -C src/qt-console install \
-	DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT{%{_sbindir},%{_bindir}}/bat
+# 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/bat.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 
@@ -625,7 +575,7 @@ install -p updatedb/update_*_tables_10_to_11 $RPM_BUILD_ROOT%{_libexecdir}/%{nam
 touch $RPM_BUILD_ROOT%{_sysconfdir}/{dir-password,fd-password,sd-password}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/{mon-dir-password,mon-fd-password,mon-sd-password}
 
-mv $RPM_BUILD_ROOT%{_libdir}/bacula/mtx-changer.conf $RPM_BUILD_ROOT/etc/bacula/mtx-changer.conf
+mv $RPM_BUILD_ROOT%{_libexecdir}/%{name}/mtx-changer.conf $RPM_BUILD_ROOT%{_sysconfdir}/mtx-changer.conf
 
 # some file changes
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/%{name}/{gconsole,startmysql,stopmysql,bacula,bconsole,fd}
@@ -656,12 +606,8 @@ mv $RPM_BUILD_ROOT%{_mandir}/man8/{,bacula-}dbcheck.8.gz
 # no -devel files packaged, so this is also useless
 rm $RPM_BUILD_ROOT%{_libdir}/libbac{,cfg,find,py,sql}.{so,la}
 
-# placeholders for the symlinks set in %%post db-*
-for f in create_bacula_database drop_bacula_database drop_bacula_tables \
-	grant_bacula_privileges make_bacula_tables update_bacula_tables ; do
-
-	touch $RPM_BUILD_ROOT%{_libexecdir}/%{name}/$f
-done
+# FIXME, something in post
+rm $RPM_BUILD_ROOT/usr/lib64/libbaccats-5.2.1.so
 
 %if %{with nagios}
 install -d $RPM_BUILD_ROOT%{nagiosplugindir}
@@ -680,7 +626,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %define update_configs \
 echo "Updating bacula passwords and names..." | %banner -a %{name} \
-cd /etc/bacula \
+cd %{_sysconfdir} \
 for f in *-password; do \
 	if [ ! -s $f ]; then \
 		openssl rand -base64 33 > $f \
@@ -758,7 +704,7 @@ fi
 %update_configs
 
 %triggerpostun common -- %{name}-common < 5.0.1-2
-find /etc/bacula/bat.conf* -perm /007 -print0 | xargs -0 -r chmod 600 || :
+find %{_sysconfdir}/bat.conf* -perm /007 -print0 2>/dev/null | xargs -0 -r chmod 600 || :
 
 %post console-qt4
 %update_configs
@@ -794,46 +740,28 @@ for name in "create database" "drop tables" "drop database" "grant privileges" "
 	suffix="${name#* }" \
 	ln -sf "${prefix}_%{1}_${suffix}" %{_libexecdir}/%{name}/"${prefix}_bacula_${suffix}" || : \
 done \
+ln -sf "make_%{1}_catalog_backup" %{_libexecdir}/%{name}/make_catalog_backup || : \
 %service bacula-dir restart "Bacula Director daemon"
 
-%define db_postun() \
-/sbin/ldconfig \
-if [ "$1" = "0" ]; then \
-	for f in %{_libexecdir}/%{name}/*_bacula_*; do \
-		if [ -L "$f" -a ! -e "$f" ]; then \
-			rm "$f" \
-		fi \
-	done \
-fi
-
 %post db-postgresql
 %db_post postgresql
 
-%postun db-postgresql
-%db_postun postgresql
+%postun db-postgresql -p /sbin/ldconfig
 
 %post db-mysql
 %db_post mysql
 
-%postun db-mysql
-%db_postun mysql
+%postun db-mysql -p /sbin/ldconfig
 
 %post db-sqlite3
 %db_post sqlite3
 
-%postun db-sqlite3
-%db_postun sqlite3
-
-# dbi backend is different, as it is not bound with a specific db engine
-%post db-dbi
-/sbin/ldconfig
-%service bacula-dir restart "Bacula Director daemon"
-
-%postun db-dbi -p /sbin/ldconfig
+%postun db-sqlite3 -p /sbin/ldconfig
 
 %files common
 %defattr(644,root,root,755)
 %doc LICENSE
+%{?with_python:%doc examples/python}
 %dir %{_sysconfdir}
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*-password
 # do not remove bsmtp from files. Fix build if it is not installed.
@@ -870,26 +798,28 @@ fi
 %{_mandir}/man8/bacula-dir.8*
 %{_mandir}/man8/bacula-dbcheck.8*
 %{_libexecdir}/%{name}/query.sql
-#%attr(755,root,root) %{_libexecdir}/%{name}/make_catalog_backup
-#%attr(755,root,root) %{_libexecdir}/%{name}/delete_catalog_backup
+%attr(755,root,root) %{_libexecdir}/%{name}/delete_catalog_backup
 
 %files db-postgresql
 %defattr(644,root,root,755)
+#%attr(755,root,root) %{_libexecdir}/%{name}/fix_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/create_postgresql_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_postgresql_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_postgresql_*
-%attr(755,root,root) %{_libdir}/libbacsql-postgresql-5*.so
+#attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_catalog_backup
+%attr(755,root,root) %{_libdir}/libbaccats-postgresql-5*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
+#%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
 %ghost %{_libexecdir}/%{name}/grant_bacula_privileges
 %ghost %{_libexecdir}/%{name}/make_bacula_tables
 %ghost %{_libexecdir}/%{name}/update_bacula_tables
+#%ghost %{_libexecdir}/%{name}/make_catalog_backup
 
 %files db-mysql
 %defattr(644,root,root,755)
@@ -899,15 +829,17 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_mysql_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_mysql_*
-%attr(755,root,root) %{_libdir}/libbacsql-mysql-5*.so
+#%attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_catalog_backup
+%attr(755,root,root) %{_libdir}/libbaccats-mysql-5*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
+#%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
 %ghost %{_libexecdir}/%{name}/grant_bacula_privileges
 %ghost %{_libexecdir}/%{name}/make_bacula_tables
 %ghost %{_libexecdir}/%{name}/update_bacula_tables
+#%ghost %{_libexecdir}/%{name}/make_catalog_backup
 
 %files db-sqlite3
 %defattr(644,root,root,755)
@@ -917,46 +849,22 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_sqlite3_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
-%attr(755,root,root) %{_libdir}/libbacsql-sqlite3-5*.so
+#%attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_catalog_backup
+%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-5*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
+#%ghost %attr(755,root,root) %{_libdir}/libbaccats-5*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
 %ghost %{_libexecdir}/%{name}/grant_bacula_privileges
 %ghost %{_libexecdir}/%{name}/make_bacula_tables
 %ghost %{_libexecdir}/%{name}/update_bacula_tables
-
-%if %{with dbi}
-%files db-dbi
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/%{name}/create_postgresql_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/grant_postgresql_privileges
-%attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/update_postgresql_*
-%attr(755,root,root) %{_libexecdir}/%{name}/create_mysql_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_mysql_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_mysql_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/grant_mysql_privileges
-%attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/update_mysql_*
-%attr(755,root,root) %{_libexecdir}/%{name}/create_sqlite3_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_sqlite3_database
-%attr(755,root,root) %{_libexecdir}/%{name}/drop_sqlite3_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/grant_sqlite3_privileges
-%attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
-%attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
-%attr(755,root,root) %{_libdir}/libbacsql-dbi-5*.so
-
-%ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
-%endif
+#%ghost %{_libexecdir}/%{name}/make_catalog_backup
 
 %files fd
 %defattr(644,root,root,755)
 %doc LICENSE
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bacula-fd.conf
+%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bacula-fd.conf
 %attr(754,root,root) /etc/rc.d/init.d/bacula-fd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bacula-fd
 %attr(755,root,root) %{_sbindir}/bacula-fd
@@ -966,8 +874,8 @@ fi
 %files sd
 %defattr(644,root,root,755)
 %doc LICENSE
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bacula-sd.conf
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mtx-changer.conf
+%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bacula-sd.conf
+%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mtx-changer.conf
 %attr(754,root,root) /etc/rc.d/init.d/bacula-sd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bacula-sd
 %attr(755,root,root) %{_sbindir}/bacula-sd
@@ -989,7 +897,7 @@ fi
 %files console
 %defattr(644,root,root,755)
 %doc LICENSE
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bconsole.conf
+%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bconsole.conf
 %attr(755,root,root) %{_sbindir}/bconsole
 %{_mandir}/man8/bconsole.8*
 
@@ -999,8 +907,8 @@ fi
 %doc LICENSE
 %{_pixmapsdir}/%{name}.png
 %{_desktopdir}/bacula-wx.desktop
-%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bwx-console.conf
-%attr(755,root,root) %{_sbindir}/bwx-console
+#%attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bwx-console.conf
+#%attr(755,root,root) %{_sbindir}/bwx-console
 %{_mandir}/man1/bacula-bwxconsole.1*
 %endif