- tools build when dbi is used fixed, so the important bsmtp is built and

  included in the package
- cleanup (some files removed in %install, some added to %files)
- unused qmake-qt4 patch removed
- Release: 0.2

Changed files:
    bacula-dbi_dbcheck.patch -> 1.1
    bacula-qmake-qt4.patch -> 1.2
    bacula.spec -> 1.125

diff --git a/bacula-dbi_dbcheck.patch b/bacula-dbi_dbcheck.patch
new file mode 100644 (file)
index 0000000..ddd4149
--- /dev/null
+++ b/bacula-dbi_dbcheck.patch
@@ -0,0 +1,14 @@
+--- bacula-5.0.1/src/cats/dbi.c.orig   2010-02-24 16:33:48.000000000 +0100
++++ bacula-5.0.1/src/cats/dbi.c        2010-03-16 09:12:10.000000000 +0100
+@@ -717,6 +717,11 @@
+    return errmsg;
+ }
+ 
++void db_check_backend_thread_safe()
++{
++   Emsg0(M_WARNING, 0, _("Cannot be sure if DBI is thread-safe"));
++}
++
+ #ifdef HAVE_BATCH_FILE_INSERT
+ 
+ /*

diff --git a/bacula-qmake-qt4.patch b/bacula-qmake-qt4.patch
deleted file mode 100644 (file)
index 9351069..0000000
--- a/bacula-qmake-qt4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bacula-5.0.1/autoconf/configure.in~        2010-02-25 23:34:52.000000000 +0100
-+++ bacula-5.0.1/autoconf/configure.in 2010-02-25 23:38:30.000000000 +0100
-@@ -3113,7 +3113,7 @@
-       AC_MSG_ERROR([Could not find qmake $PATH. Check your Qt installation])
-    fi
- 
--   QMAKEBIN="qmake"
-+   QMAKEBIN="qmake-qt4"
-    cd src/qt-console
-    echo "Creating bat Makefile"
-    touch bat

diff --git a/bacula.spec b/bacula.spec
index 75bbb1c7f8441ab4a239ae4f3b8b83af2f845b91..4bad9a1ef2f1c7a0f19429848ef04d2045a594ce 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,43 +2,6 @@
 #      - update desktop files, think about su-wrappers for console
 #      - package web admin
 #      - fix log file permissions
-#warning: Installed (but unpackaged) file(s) found:
-#   /usr/lib64/bacula/bacula-ctl-dir
-#   /usr/lib64/bacula/bacula-ctl-fd
-#   /usr/lib64/bacula/bacula-ctl-sd
-#   /usr/lib64/bacula/bacula_config
-#   /usr/lib64/bacula/update_sqlite_tables_10_to_11.in
-#   /usr/lib64/bacula/update_sqlite_tables_4_to_5
-#   /usr/lib64/bacula/update_sqlite_tables_5_to_6
-#   /usr/lib64/bacula/update_sqlite_tables_6_to_7
-#   /usr/lib64/bacula/update_sqlite_tables_7_to_8
-#   /usr/lib64/bacula/update_sqlite_tables_8_to_9
-#   /usr/lib64/bacula/update_sqlite_tables_9_to_10.in
-#   /usr/lib64/bpipe-fd.so
-#   /usr/lib64/libbac.la
-#   /usr/lib64/libbac.so
-#   /usr/lib64/libbaccfg.la
-#   /usr/lib64/libbaccfg.so
-#   /usr/lib64/libbacfind.la
-#   /usr/lib64/libbacfind.so
-#   /usr/lib64/libbacpy.la
-#   /usr/lib64/libbacpy.so
-#   /usr/lib64/libbacsql.la
-#   /usr/lib64/libbacsql.so
-#   /usr/sbin/bacula
-#   /usr/share/doc/bacula/html/clients.html
-#   /usr/share/doc/bacula/html/console.html
-#   /usr/share/doc/bacula/html/filesets.html
-#   /usr/share/doc/bacula/html/index.html
-#   /usr/share/doc/bacula/html/joblist.html
-#   /usr/share/doc/bacula/html/jobplot.html
-#   /usr/share/doc/bacula/html/jobs.html
-#   /usr/share/doc/bacula/html/mail-message-new.png
-#   /usr/share/doc/bacula/html/media.html
-#   /usr/share/doc/bacula/html/restore.html
-#   /usr/share/doc/bacula/html/status.png
-#   /usr/share/doc/bacula/html/storage.html
-#
 #
 # Conditional build:
 %bcond_without console_wx              # wx-console program
@@ -83,7 +46,7 @@ Summary:      Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
 Version:       5.0.1
-Release:       0.1
+Release:       0.2
 Epoch:         0
 License:       extended GPL v2
 Group:         Networking/Utilities
@@ -108,7 +71,7 @@ Patch4:              %{name}-conf.patch
 Patch5:                %{name}-desktop.patch
 Patch6:                %{name}-64bitbuild_fix.patch
 Patch7:                %{name}-dbi_fixes.patch
-Patch8:                %{name}-qmake-qt4.patch
+Patch8:                %{name}-dbi_dbcheck.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -457,6 +420,7 @@ danego systemu, należy ponownie uruchomić ./getdiskinfo .
 %patch5 -p1
 #%patch6 -p1
 %{?with_dbi:%patch7 -p1}
+%patch8 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -593,6 +557,21 @@ rm $RPM_BUILD_ROOT%{_docdir}/bacula/ReleaseNotes
 rm $RPM_BUILD_ROOT%{_docdir}/bacula/VERIFYING
 rm $RPM_BUILD_ROOT%{_docdir}/bacula/technotes
 
+# startup scripts, those in /etc/rc.d/init.d are better
+rm $RPM_BUILD_ROOT%{_sbindir}/bacula
+rm $RPM_BUILD_ROOT%{_libexecdir}/%{name}/bacula-ctl-*
+
+# rename to avoid possible conflicts
+mv $RPM_BUILD_ROOT%{_sbindir}/{,bacula-}dbcheck
+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}
+
+# sqlite is not supported
+rm $RPM_BUILD_ROOT%{_libexecdir}/%{name}/update_sqlite_*
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -784,19 +763,21 @@ fi
 %doc LICENSE
 %dir %{_sysconfdir}
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*-password
-#%attr(755,root,root) %{_sbindir}/bsmtp
+# do not remove bsmtp from files. Fix build if it is not installed.
+%attr(755,root,root) %{_sbindir}/bsmtp
 %attr(755,root,root) %{_sbindir}/btraceback
-%attr(755,root,root) /%{_libdir}/libbac-%{version}.so
-%attr(755,root,root) /%{_libdir}/libbaccfg-%{version}.so
-%attr(755,root,root) /%{_libdir}/libbacfind-%{version}.so
-%attr(755,root,root) /%{_libdir}/libbacpy-%{version}.so
-%attr(755,root,root) /%{_libdir}/libbacsql-%{version}.so
+%attr(755,root,root) %{_libdir}/libbac-%{version}.so
+%attr(755,root,root) %{_libdir}/libbaccfg-%{version}.so
+%attr(755,root,root) %{_libdir}/libbacfind-%{version}.so
+%attr(755,root,root) %{_libdir}/libbacpy-%{version}.so
+%attr(755,root,root) %{_libdir}/libbacsql-%{version}.so
 %{_mandir}/man8/bacula.8*
 %{_mandir}/man1/bsmtp.1*
 %{_mandir}/man8/btraceback.8*
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/btraceback.dbx
 %{_libexecdir}/%{name}/btraceback.gdb
+%{_libexecdir}/%{name}/bacula_config
 %attr(770,root,bacula) %dir %{_localstatedir}
 %attr(750,bacula,logs) %dir /var/log/bacula
 %attr(640,bacula,logs) %ghost /var/log/bacula/log
@@ -811,11 +792,11 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/bacula-dir
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bacula-dir
 %attr(755,root,root) %{_sbindir}/bacula-dir
-#%attr(755,root,root) %{_sbindir}/bregex
-#%attr(755,root,root) %{_sbindir}/bwild
-#%attr(755,root,root) %{_sbindir}/dbcheck
+%attr(755,root,root) %{_sbindir}/bregex
+%attr(755,root,root) %{_sbindir}/bwild
+%attr(755,root,root) %{_sbindir}/bacula-dbcheck
 %{_mandir}/man8/bacula-dir.8*
-%{_mandir}/man8/dbcheck.8*
+%{_mandir}/man8/bacula-dbcheck.8*
 %{_libexecdir}/%{name}/query.sql
 %if %{with bdb} || %{with dbi}
 %attr(755,root,root) %{_libexecdir}/%{name}/create_bdb_database
@@ -867,6 +848,7 @@ fi
 %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
+%attr(755,root,root) %{_libdir}/bpipe-fd.so
 %{_mandir}/man8/bacula-fd.8*
 
 %files sd
@@ -919,6 +901,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bat.conf
 %attr(755,root,root) %{_sbindir}/bat
 %{_mandir}/man1/bat.1*
+%{_docdir}/%{name}
 %endif
 
 %if %{with console_wx}