- updated to 7.2.0

diff --git a/bacula.spec b/bacula.spec
index 0683b796ca5f741364b1499238e534024f4314df..3075c801adbe404f332f83cbf874d5c92c331e53 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -17,12 +17,12 @@
 Summary:       Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
-Version:       7.0.5
+Version:       7.2.0
 Release:       1
 License:       AGPL v3
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: b4a99d673f5e1eaae8b257ccc610241f
+# Source0-md5: 8381b6523dab31648a0bae417e60832b
 Source10:      %{name}-dir.init
 Source11:      %{name}-fd.init
 Source12:      %{name}-sd.init
@@ -35,6 +35,7 @@ Patch1:               %{name}-branding.patch
 Patch2:                %{name}-conf.patch
 Patch3:                %{name}-desktop.patch
 Patch4:                make_catalog_backup-setup-home.patch
+Patch5:                %{name}-libtool.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -387,6 +388,7 @@ Nagios plugin to check bacula.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 sed -i -e 's#bindir=.*#bindir=%{_bindir}#g' \
        src/cats/create_* src/cats/delete_* src/cats/drop_* \
@@ -397,8 +399,9 @@ sed -i -e 's/@basename@/--hostname--/' src/*/*.conf.in
 %build
 cd autoconf
 %{__aclocal} -I bacula-macros -I gettext-macros
-# $BUILD_DIR not seen by libtoolize, export it
-BUILD_DIR=.. %{__libtoolize}
+%{__libtoolize}
+mv autoconf/* .
+rmdir autoconf
 cd ..
 %{__autoconf} --prepend-include=$(pwd)/autoconf autoconf/configure.in > configure
 
@@ -496,7 +499,8 @@ touch $RPM_BUILD_ROOT/var/log/bacula/log
 # 5.0 -> 5.2 : 12_to_14
 install -p updatedb/update_*_tables_10_to_11 $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p updatedb/update_*_tables_11_to_12 $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p updatedb/update_*_tables_12_to_14 $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p updatedb/update_*_tables_12_to_13 $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p updatedb/update_*_tables_13_to_14 $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
 # place for site passwords
 touch $RPM_BUILD_ROOT%{_sysconfdir}/{dir-password,fd-password,sd-password}
@@ -514,7 +518,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/bacula/LICENSE
 rm $RPM_BUILD_ROOT%{_docdir}/bacula/README
 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
@@ -669,7 +672,6 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \
 %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.
-%attr(755,root,root) %{_sbindir}/bpluginfo
 %attr(755,root,root) %{_sbindir}/bsmtp
 %attr(755,root,root) %{_sbindir}/btraceback
 %attr(755,root,root) %{_libdir}/libbac-7*.so
@@ -677,7 +679,6 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \
 %attr(755,root,root) %{_libdir}/libbacfind-7*.so
 %attr(755,root,root) %{_libdir}/libbacsql-7*.so
 %{_mandir}/man8/bacula.8*
-%{_mandir}/man8/bpluginfo.8*
 %{_mandir}/man1/bsmtp.1*
 %{_mandir}/man8/btraceback.8*
 %dir %{_libexecdir}/%{name}