[bacula/el5] Update spec file for make_catalog_backup

[Simone Caronni]

commit f928f537eccb9156f02f2f1ae541cdda9022be97
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Jul 26 16:55:17 2012 +0200

    Update spec file for make_catalog_backup

 bacula.spec |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index b31dee1..0ae3e4e 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 Summary:        Cross platform network backup for Linux, Unix, Mac and Windows
 Name:           bacula
 Version:        2.4.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.%{name}.org
@@ -22,6 +22,7 @@ Patch0:         %{name}-2.4.4-director-configuration.patch
 Patch1:         %{name}-2.4.4-config.patch
 Patch2:         %{name}-2.4.4-fix-logwatch.patch
 Patch3:         %{name}-2.4.4-pamd.patch
+Patch4:         %{name}-2.4.4-make_catalog_backup.patch
 
 BuildRequires:  atk-devel
 BuildRequires:  bonobo-activation-devel
@@ -308,6 +309,7 @@ pushd %{name}-%{version}
 %patch1 -p1 -b .config
 %patch2 -p1 -b .fix-logwatch
 %patch3 -p1 -b .pamd
+%patch4 -p1 -b .make_catalog_backup
 
 # Remove execution permissions from files we're packaging as docs later on
 find updatedb -type f | xargs chmod -x
@@ -398,7 +400,7 @@ pushd %{name}-sqlite
         mv %{buildroot}%{_sbindir}/bscan  %{buildroot}%{_sbindir}/bscan.sqlite
 
         for script in create_%{name}_database drop_%{name}_database drop_%{name}_tables \
-                        grant_%{name}_privileges make_%{name}_tables make_catalog_backup \
+                        grant_%{name}_privileges make_%{name}_tables \
                         update_%{name}_tables; do
                 mv %{buildroot}%{_libexecdir}/%{name}/${script} %{buildroot}%{_libexecdir}/%{name}/${script}.sqlite
         done
@@ -412,7 +414,7 @@ pushd %{name}-mysql
         mv %{buildroot}%{_sbindir}/bscan  %{buildroot}%{_sbindir}/bscan.mysql
 
         for script in create_%{name}_database drop_%{name}_database drop_%{name}_tables \
-                        grant_%{name}_privileges make_%{name}_tables make_catalog_backup \
+                        grant_%{name}_privileges make_%{name}_tables \
                         update_%{name}_tables; do
                 mv %{buildroot}%{_libexecdir}/%{name}/${script} %{buildroot}%{_libexecdir}/%{name}/${script}.mysql
         done
@@ -426,7 +428,7 @@ pushd %{name}-postgresql
         mv %{buildroot}%{_sbindir}/bscan  %{buildroot}%{_sbindir}/bscan.postgresql
 
         for script in create_%{name}_database drop_%{name}_database drop_%{name}_tables \
-                        grant_%{name}_privileges make_%{name}_tables make_catalog_backup \
+                        grant_%{name}_privileges make_%{name}_tables \
                         update_%{name}_tables; do
                 mv %{buildroot}%{_libexecdir}/%{name}/${script} %{buildroot}%{_libexecdir}/%{name}/${script}.postgresql
         done
@@ -518,7 +520,6 @@ replace_symlink /usr/libexec/%{name}/drop_%{name}_database mysql
 replace_symlink /usr/libexec/%{name}/drop_%{name}_tables mysql
 replace_symlink /usr/libexec/%{name}/grant_%{name}_privileges mysql
 replace_symlink /usr/libexec/%{name}/make_%{name}_tables mysql
-replace_symlink /usr/libexec/%{name}/make_catalog_backup mysql
 replace_symlink /usr/libexec/%{name}/update_%{name}_tables mysql
 
 
@@ -538,7 +539,6 @@ replace_symlink /usr/libexec/%{name}/drop_%{name}_database sqlite
 replace_symlink /usr/libexec/%{name}/drop_%{name}_tables sqlite
 replace_symlink /usr/libexec/%{name}/grant_%{name}_privileges sqlite
 replace_symlink /usr/libexec/%{name}/make_%{name}_tables sqlite
-replace_symlink /usr/libexec/%{name}/make_catalog_backup sqlite
 replace_symlink /usr/libexec/%{name}/update_%{name}_tables sqlite
 
 
@@ -557,7 +557,6 @@ replace_symlink /usr/libexec/%{name}/drop_%{name}_database postgresql
 replace_symlink /usr/libexec/%{name}/drop_%{name}_tables postgresql
 replace_symlink /usr/libexec/%{name}/grant_%{name}_privileges postgresql
 replace_symlink /usr/libexec/%{name}/make_%{name}_tables postgresql
-replace_symlink /usr/libexec/%{name}/make_catalog_backup postgresql
 replace_symlink /usr/libexec/%{name}/update_%{name}_tables postgresql
 
 
@@ -582,7 +581,6 @@ remove_all_fake_dir_alternatives() {
     remove_fake_alternative /usr/libexec/%{name}/drop_%{name}_tables $suffix
     remove_fake_alternative /usr/libexec/%{name}/grant_%{name}_privileges $suffix
     remove_fake_alternative /usr/libexec/%{name}/make_%{name}_tables $suffix
-    remove_fake_alternative /usr/libexec/%{name}/make_catalog_backup $suffix
     remove_fake_alternative /usr/libexec/%{name}/update_%{name}_tables $suffix
 }
 remove_all_fake_dir_alternatives mysql
@@ -609,7 +607,6 @@ remove_all_fake_dir_alternatives() {
     remove_fake_alternative /usr/libexec/%{name}/drop_%{name}_tables $suffix
     remove_fake_alternative /usr/libexec/%{name}/grant_%{name}_privileges $suffix
     remove_fake_alternative /usr/libexec/%{name}/make_%{name}_tables $suffix
-    remove_fake_alternative /usr/libexec/%{name}/make_catalog_backup $suffix
     remove_fake_alternative /usr/libexec/%{name}/update_%{name}_tables $suffix
 }
 remove_all_fake_dir_alternatives sqlite
@@ -636,7 +633,6 @@ remove_all_fake_dir_alternatives() {
     remove_fake_alternative /usr/libexec/%{name}/drop_%{name}_tables $suffix
     remove_fake_alternative /usr/libexec/%{name}/grant_%{name}_privileges $suffix
     remove_fake_alternative /usr/libexec/%{name}/make_%{name}_tables $suffix
-    remove_fake_alternative /usr/libexec/%{name}/make_catalog_backup $suffix
     remove_fake_alternative /usr/libexec/%{name}/update_%{name}_tables $suffix
 }
 remove_all_fake_dir_alternatives postgresql
@@ -863,6 +859,8 @@ fi
 %{_sbindir}/bwild
 %{_mandir}/man8/dbcheck.8*
 %{_mandir}/man8/%{name}-dir.8*
+%{_libexecdir}/%{name}/make_catalog_backup
+%{_libexecdir}/%{name}/make_catalog_backup.pl
 %{_libexecdir}/%{name}/delete_catalog_backup
 
 %files director-mysql
@@ -880,7 +878,6 @@ fi
 %{_libexecdir}/%{name}/drop_%{name}_tables.mysql
 %{_libexecdir}/%{name}/grant_%{name}_privileges.mysql
 %{_libexecdir}/%{name}/make_%{name}_tables.mysql
-%{_libexecdir}/%{name}/make_catalog_backup.mysql
 %{_libexecdir}/%{name}/update_%{name}_tables.mysql
 
 %files director-sqlite
@@ -899,7 +896,6 @@ fi
 %{_libexecdir}/%{name}/drop_%{name}_tables.sqlite
 %{_libexecdir}/%{name}/grant_%{name}_privileges.sqlite
 %{_libexecdir}/%{name}/make_%{name}_tables.sqlite
-%{_libexecdir}/%{name}/make_catalog_backup.sqlite
 %{_libexecdir}/%{name}/update_%{name}_tables.sqlite
 
 %files director-postgresql
@@ -917,7 +913,6 @@ fi
 %{_libexecdir}/%{name}/drop_%{name}_tables.postgresql
 %{_libexecdir}/%{name}/grant_%{name}_privileges.postgresql
 %{_libexecdir}/%{name}/make_%{name}_tables.postgresql
-%{_libexecdir}/%{name}/make_catalog_backup.postgresql
 %{_libexecdir}/%{name}/update_%{name}_tables.postgresql
 
 %files storage-common
@@ -967,6 +962,9 @@ fi
 
 
 %changelog
+* Thu Jul 26 2012 Robert Scheck <robert at fedoraproject.org> 2.4.4-8
+- Swap make_catalog_backup with perl variant from 5.2.10 (rhbz#456612).
+
 * Thu Jul 26 2012 Robert Scheck <robert at fedoraproject.org> 2.4.4-7
 - Really re-added shared script applybaculadate for logwatch