File project.diff of Package bacula
--- bacula.changes.orig
+++ bacula.changes
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Fri Oct 29 12:00:24 UTC 2010 - davejplater@gmail.com
+
+- Moved mtx-changer.conf from libexec/bacula to etc/bacula see :
+ bnc#620111
+
+-------------------------------------------------------------------
+Fri Oct 29 08:35:44 UTC 2010 - davejplater@gmail.com
+
+- Major package and specfile cleanup. Deleted all unused files.
+
+-------------------------------------------------------------------
Mon May 10 07:23:51 UTC 2010 - davejplater@gmail.com
- Update to version 5.0.2, fixed openSSL patch in
--- bacula.spec.orig
+++ bacula.spec
@@ -1,5 +1,5 @@
#
-# spec file for package bacula (Version 5.0.2)
+# spec file for package bacula (Version 5.0.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,6 @@
# norootforbuild
%define working_dir %{_localstatedir}/spool/bacula
-#%define working_dir /var/lib/bacula/working
%define script_dir %{_libexecdir}/bacula
#%define rescue_version 2.0.0
%define gui_version %{version}
@@ -34,12 +33,12 @@
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
Name: bacula
-Version: 5.0.2
+Version: 5.0.3
Release: 0
-License: GPLv2 with exceptions
+License: AGPLv3
Group: Productivity/Archiving/Backup
AutoReqProv: on
-Source0: bacula-%{version}.tar.bz2
+Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.bz2
Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.bz2
Source2: http://download.sourceforge.net/bacula/bacula-gui-%{gui_version}.tar.bz2
Source3: bacula-gconsole.desktop
@@ -60,8 +59,9 @@ Source22: bacula-sd.fw
Patch0: bacula-director-configuration.patch
Patch1: bacula-pamd.patch
-Patch2: %{name}-%{version}-openssl.patch
+Patch2: %{name}-5.0.2-openssl.patch
Patch3: bacula-5.0.0-wrong-script-interpreter.patch
+Patch4: bacula-5.0.3-mtxchangerconf.patch
URL: http://www.bacula.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -364,6 +364,7 @@ pushd bacula-%{version}
%patch1 -p1
%patch2 -p1 -b .openssl
%patch3 -p1
+%patch4
# Remove execution permissions from files we're packaging as docs later on
find examples -type f | xargs chmod -x
@@ -402,9 +403,11 @@ lndir ../bacula-%{version}
export CFLAGS=-I%{_includedir}/ncurses
export CPPFLAGS=-I%{_includedir}/ncurses
%configure \
+ --oldincludedir=%{_includedir} \
+ --datarootdir=%{_datadir} \
+ --localedir=%{_datadir}/locale \
--sysconfdir=%{_sysconfdir}/%{name}/ \
--with-pid-dir=%{pid_dir} \
- --libdir=%{_libdir} \
--docdir=%{_docdir}/%{name}/ \
--htmldir=%{_docdir}/%{name}/html/ \
--with-plugindir=%{script_dir} \
@@ -445,9 +448,9 @@ if test $? != 0; then
exit 1
fi
-
-#%__make %{?jobs:-j%{jobs}} CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="$RPM_OPT_FLAGS"
-%__make %{?jobs:-j%{jobs}} CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -ggdb"
+export CXXFLAGS="$CFLAGS"
+%__make %{?jobs:-j%{jobs}}
}
@@ -465,7 +468,7 @@ popd
# Build web
pushd %{name}-gui-%{version}
%configure --with-bacula=%{_builddir}/%{name}-%{version}/bacula-mysql
-make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$CFLAGS"
+make CFLAGS="$RPM_OPT_FLAGS -ggdb" CXXFLAGS="$CFLAGS"
popd
%install
@@ -516,6 +519,7 @@ cp -r %{name}-docs-%{version}/home-page/
cp -r %{name}-docs-%{version}/home-page/presentations %{buildroot}/srv/www/htdocs/
cp -r %{name}-docs-%{version}/home-page/misc %{buildroot}/srv/www/htdocs/
cp %{SOURCE14} %{buildroot}/srv/www/htdocs/
+find %{buildroot}/srv/ -empty -delete
# Fix some wrapper braindeadness
rm -f %{buildroot}%{script_dir}/bconsole
@@ -719,12 +723,13 @@ fi
%dir %{_docdir}/%{name}
%dir %{script_dir}
#%dir %{_libdir}/%{name}
-%dir /var/lib/bacula
%dir %attr(750, %{pkg_user}, %{pkg_user}) %{_localstatedir}/log/%{name}
%dir %attr(750, %{pkg_user}, %{pkg_user}) %{working_dir}
%config(noreplace) %{_sysconfdir}/logrotate.d/bacula
%{_sbindir}/bsmtp
%{_sbindir}/btraceback
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/btraceback.mdb
%{_mandir}/man1/bsmtp.1*
%{_mandir}/man8/bacula.8*
%{_mandir}/man8/btraceback.8*
@@ -732,7 +737,7 @@ fi
%{script_dir}/btraceback.dbx
%{script_dir}/btraceback.gdb
#%{script_dir}/bpipe-fd.so
-%attr(644, root, root) %{script_dir}/mtx-changer.conf
+%attr(644, root, root) %config(noreplace) %{_sysconfdir}/%{name}/mtx-changer.conf
%{_datadir}/pixmaps/bacula.png
