[bacula/f16] Remove conditionals for EOL distros

[Simone Caronni]

commit de9a7a4a60ffcb8fff37226f4148e2afc48a5645
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Sep 24 11:10:00 2012 +0200

    Remove conditionals for EOL distros

 bacula.spec |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 405cf66..0fd72b6 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -75,17 +75,14 @@ BuildRequires:          zlib-devel
 BuildRequires:          wxGTK-devel
 %endif
 
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:          qt4-devel >= 4.6.2
-%endif
-
-%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
 BuildRequires:          tcp_wrappers-devel
 %else
 BuildRequires:          tcp_wrappers
 %endif
 
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 BuildRequires:          systemd-units
 %endif
 
@@ -210,7 +207,7 @@ Requires:               bacula-common = %{version}-%{release}
 Requires:               logwatch
 Requires(pre):          shadow-utils
 Requires(postun):       shadow-utils
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 Requires(post):         systemd-sysv
 Requires(post):         systemd-units
 Requires(preun):        systemd-units
@@ -237,7 +234,7 @@ bacula-director-mysql, bacula-director-sqlite or bacula-director-postgresql.
 Summary:                Bacula backup client
 Group:                  System Environment/Daemons
 Requires:               bacula-common = %{version}-%{release}
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 Requires(post):         systemd-sysv
 Requires(post):         systemd-units
 Requires(preun):        systemd-units
@@ -263,7 +260,7 @@ Summary:                Common Bacula storage daemon files
 Group:                  System Environment/Daemons
 Requires:               bacula-storage = %{version}-%{release}
 Requires:               bacula-common = %{version}-%{release}
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 Requires(post):         systemd-sysv
 Requires(post):         systemd-units
 Requires(preun):        systemd-units
@@ -366,7 +363,7 @@ This package contains the command-line management console for the bacula backup
 system.
 
 
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} >= 6
 
 %package console-bat
 Summary:                Bacula bat console
@@ -519,7 +516,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 # Regen bat QT project file and build tools
 pushd bacula-base
-        %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+        %if 0%{?fedora} || 0%{?rhel} >= 6
         export QMAKE=/usr/bin/qmake-qt4
         build \
                 --enable-bat \
@@ -610,7 +607,7 @@ pushd bacula-base
         ln -sf consolehelper %{buildroot}%{_bindir}/bacula-tray-monitor
         desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE11}
 
-        %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+        %if 0%{?fedora} || 0%{?rhel} >= 6
         install -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
         install -m 644 -D scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
         install -m 644 -D scripts/bat.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bat
@@ -618,8 +615,6 @@ pushd bacula-base
         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 +690,7 @@ install -m 644 -D bacula-base/scripts/logwatch/logfile.bacula.conf %{buildroot}%
 install -m 644 -D bacula-base/scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
 
 install -m 755 -D %{SOURCE3} %{buildroot}%{_sbindir}/bacula-checkconf
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 # Systemd unit files
 mkdir -p %{buildroot}%{_unitdir}
 install -m 755 -D %{SOURCE7}  %{buildroot}%{_unitdir}/bacula-fd.service
@@ -740,7 +735,7 @@ chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
 rm -rf %{buildroot}%{_datadir}/doc/bacula/
 
 # Remove bat man page if bat is not built (gets installed unconditionally from make install)
-%if 0%{?fedora} <= 12 || 0%{?rhel} <= 5
+%if 0%{?rhel} <= 5
 rm -f %{buildroot}%{_mandir}/man1/bat.1*
 %endif
 
@@ -899,7 +894,7 @@ test "$1" != 0 || userdel %username &>/dev/null || :
 test "$1" != 0 || groupdel %username &>/dev/null || :
 exit 0
 
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 
 %post client
 if [ $1 -eq 1 ] ; then 
@@ -1095,7 +1090,7 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
 %{_sbindir}/bacula-fd
 %{_libdir}/bacula/bpipe-fd.so
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 %{_unitdir}/bacula-fd.service
 %else
 %{_initrddir}/bacula-fd
@@ -1108,7 +1103,7 @@ fi
 %{_sbindir}/bconsole
 %{_mandir}/man8/bconsole.8*
 
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} >= 6
 %files console-bat
 %defattr(-,root,root,-)
 %doc %{_datadir}/doc/bacula-console-bat-%{version}/*
@@ -1146,7 +1141,7 @@ fi
 %config %{_sysconfdir}/logwatch/conf/services/bacula.conf
 %{_sysconfdir}/logwatch/scripts/services/bacula
 %{_sysconfdir}/logwatch/scripts/shared/applybaculadate
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 %{_unitdir}/bacula-dir.service
 %else
 %{_initrddir}/bacula-dir
@@ -1219,7 +1214,7 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
-%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 %{_unitdir}/bacula-sd.service
 %else
 %{_initrddir}/bacula-sd