diff --git a/bacula-5.0.1-dsolink.patch b/bacula-5.0.1-dsolink.patch new file mode 100644 index 0000000..51ec8b4 --- /dev/null +++ b/bacula-5.0.1-dsolink.patch @@ -0,0 +1,11 @@ +--- bacula-5.0.1/bacula-5.0.1/src/qt-console/bat.pro.in~ 2010-02-24 09:33:48.000000000 -0600 ++++ bacula-5.0.1/bacula-5.0.1/src/qt-console/bat.pro.in 2010-03-11 17:12:44.645296544 -0600 +@@ -20,7 +20,7 @@ + TARGET = bat + DEPENDPATH += . + INCLUDEPATH += .. . ./console ./restore ./select +-LIBS += -L../lib -lbaccfg -lbac @OPENSSL_LIBS@ ++LIBS += -L../lib -lbaccfg -lbac -ldl @OPENSSL_LIBS@ + LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link + LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install + QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) diff --git a/bacula.spec b/bacula.spec index 6a4877d..8294a9a 100644 --- a/bacula.spec +++ b/bacula.spec @@ -7,7 +7,7 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula -Version: 5.0.0 +Version: 5.0.1 Release: 1%{?dist} # See LICENSE for details License: GPLv2 with exceptions @@ -40,6 +40,7 @@ Patch3: bacula-pamd.patch #Patch11: bacula-2.4.3-orphaned-jobs.patch #Patch12: bacula-2.4.3-python26.patch Patch13: bacula-3.0.2-openssl.patch +Patch14: bacula-5.0.1-dsolink.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 @@ -367,6 +368,7 @@ pushd bacula-%{version} #%patch11 -p0 #%patch12 -p0 %patch13 -p2 -b .openssl +%patch14 -p2 # Remove execution permissions from files we're packaging as docs later on find examples -type f | xargs chmod -x @@ -394,6 +396,7 @@ build() { cp -rl ../bacula-%{version}/* . export CFLAGS=-I%{_includedir}/ncurses export CPPFLAGS=-I%{_includedir}/ncurses +export QMAKE=/usr/bin/qmake-qt4 %configure \ --sysconfdir=%{_sysconfdir}/bacula \ --with-dir-user=bacula \ @@ -425,7 +428,6 @@ export CPPFLAGS=-I%{_includedir}/ncurses --enable-smartalloc \ --with-x \ --enable-bat \ - --with-qwt=/usr/lib \ --disable-libtool \ $* # Scratch this, it is trouble @@ -624,6 +626,8 @@ mv %{buildroot}%{_libexecdir}/bacula/query.sql %{buildroot}%{_sysconfdir}/bacula # Nuke the scripts we do not need rm -vf %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql} +# Install bat.conf +install -m 644 bacula-sqlite/src/qt-console/bat.conf %{buildroot}%{_sysconfdir}/bacula/bat.conf # Fix up some perms so rpmlint does not complain too much chmod 755 %{buildroot}%{_sbindir}/* @@ -1006,6 +1010,9 @@ fi %changelog +* Thu Feb 25 2010 Jon Ciesla