[bacula/f16] Revert "Additional el5 build fixes"

[Lukáš Nykrýn]

commit 5a016e66de45f02fe63d1fa8fc8757fdf7e88f8e
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Wed Sep 19 12:30:49 2012 +0200

    Revert "Additional el5 build fixes"
    
    This reverts commit 1e6533d3b764cd46fc9659bac75cfc53c177c7c3.

 bacula.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index c65008e..3308da5 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -575,6 +575,7 @@ pushd bacula-base
 
         # Desktop Integration
         mkdir -p %{buildroot}%{_bindir}
+        install -m 644 -D scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png
 
         %if ! 0%{?rhel}
         # bwxconsole
@@ -597,10 +598,9 @@ pushd bacula-base
         install -m 644 -D scripts/bat.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bat
         ln -sf consolehelper %{buildroot}%{_bindir}/bat
         desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE12}
+
         install -m 755 -D src/qt-console/.libs/bat %{buildroot}%{_sbindir}
         install -m 644 -D src/qt-console/bat.conf %{buildroot}%{_sysconfdir}/bacula/bat.conf
-        %else
-        rm -f %{buildroot}%{_mandir}/man1/bat.1*
         %endif
 popd
 
@@ -695,7 +695,7 @@ install -m 644 -D %{SOURCE16}  %{buildroot}%{_sysconfdir}/sysconfig/bacula-dir
 %if 0%{?fedora} || 0%{?rhel} >= 6
 install -m 644 -D %{SOURCE17}  %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
 %else
-install -p -m 644 -D %{SOURCE18} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
+install -p -m 644 -D %{SOURCE18} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd.el5
 %endif
 
 # Wipe backup files from the multiple make install calls