Author: jajcus Date: Tue Mar 16 09:14:53 2010 GMT Module: packages Tag: HEAD ---- Log message: - 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
---- Files affected: packages/bacula: bacula.spec (1.124 -> 1.125) , bacula-dbi_dbcheck.patch (NONE -> 1.1) (NEW), bacula-qmake-qt4.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/bacula/bacula.spec diff -u packages/bacula/bacula.spec:1.124 packages/bacula/bacula.spec:1.125 --- packages/bacula/bacula.spec:1.124 Thu Feb 25 23:59:04 2010 +++ packages/bacula/bacula.spec Tue Mar 16 10:14:47 2010 @@ -3,43 +3,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 @@ -84,7 +47,7 @@ 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 @@ -109,7 +72,7 @@ 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 @@ -458,6 +421,7 @@ %patch5 -p1 #%patch6 -p1 %{?with_dbi:%patch7 -p1} +%patch8 -p1 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue @@ -594,6 +558,21 @@ 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 @@ -785,19 +764,21 @@ %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 @@ -812,11 +793,11 @@ %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 @@ -868,6 +849,7 @@ %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 @@ -920,6 +902,7 @@ %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} @@ -956,6 +939,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.125 2010/03/16 09:14:47 jajcus +- 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 + Revision 1.124 2010/02/25 22:59:04 pawelz - added qmake-qt4 patch (build using qmake-qt4 as BR suggests). ================================================================ Index: packages/bacula/bacula-dbi_dbcheck.patch diff -u /dev/null packages/bacula/bacula-dbi_dbcheck.patch:1.1 --- /dev/null Tue Mar 16 10:14:53 2010 +++ packages/bacula/bacula-dbi_dbcheck.patch Tue Mar 16 10:14:47 2010 @@ -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 + + /* ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.124&r2=1.125&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit