Remove all RHEL/CentOS 5 compatibility

bacula-sd.sysconfig.el5

@@ -1,9 +0,0 @@
-# Users for bacula storage
-# If no user is set bacula will run as root
-
-SD_USER=bacula
-SD_GROUP=disk
-
-# Useful for debugging
-#
-# OPTS="-d 200"

bacula.spec

@@ -3,13 +3,11 @@
 
 Name:               bacula
 Version:            7.4.7
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
-Group:              System Environment/Daemons
 URL:                http://www.bacula.org
-BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:            http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
@@ -29,7 +27,6 @@ Source14:           %{name}-traymonitor.desktop
 Source15:           %{name}-fd.sysconfig
 Source16:           %{name}-dir.sysconfig
 Source17:           %{name}-sd.sysconfig
-Source18:           %{name}-sd.sysconfig.el5
 # Image taken from http://www.bacula.org/git/cgit.cgi/bacula/plain/bacula/src/tray-monitor/generic.xpm
 Source19:           generic.xpm
 
@@ -56,6 +53,7 @@ BuildRequires:      sed
 BuildRequires:      gcc
 BuildRequires:      gcc-c++
 BuildRequires:      glibc-devel
+BuildRequires:      ImageMagick
 BuildRequires:      libacl-devel
 BuildRequires:      libstdc++-devel
 BuildRequires:      libxml2-devel
@@ -64,8 +62,10 @@ BuildRequires:      lzo-devel
 BuildRequires:      mysql-devel
 BuildRequires:      ncurses-devel
 BuildRequires:      postgresql-devel
+BuildRequires:      qt4-devel >= 4.6.2
 BuildRequires:      readline-devel
 BuildRequires:      sqlite-devel
+BuildRequires:      tcp_wrappers-devel
 BuildRequires:      zlib-devel
 
 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
@@ -74,14 +74,6 @@ BuildRequires:      compat-openssl10-devel
 BuildRequires:      openssl-devel
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
-BuildRequires:      qt4-devel >= 4.6.2
-BuildRequires:      tcp_wrappers-devel
-BuildRequires:      ImageMagick
-%else
-BuildRequires:      tcp_wrappers
-%endif
-
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:      systemd
 %endif
@@ -95,7 +87,6 @@ to find and recover lost or damaged files.
 
 %package libs
 Summary:            Bacula libraries
-Group:              System Environment/Daemons
 Obsoletes:          bacula-sysconfdir <= 2.4
 
 %description libs
@@ -108,7 +99,6 @@ Bacula programs.
 
 %package libs-sql
 Summary:            Bacula SQL libraries
-Group:              System Environment/Daemons
 Obsoletes:          bacula-libs-mysql <= 5.0.3
 Obsoletes:          bacula-libs-sqlite <= 5.0.3
 Obsoletes:          bacula-libs-postgresql <= 5.0.3
@@ -127,7 +117,6 @@ alternatives system.
 
 %package common
 Summary:            Common Bacula files
-Group:              System Environment/Daemons
 Obsoletes:          bacula-sysconfdir <= 2.4
 Provides:           group(%username) = %uid
 Provides:           user(%username) = %uid
@@ -144,7 +133,6 @@ This package contains files common to all Bacula daemons.
 
 %package director
 Summary:            Bacula Director files
-Group:              System Environment/Daemons
 Requires:           bacula-common%{?_isa} = %{version}-%{release}
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 Requires:           bacula-libs-sql%{?_isa} = %{version}-%{release}
@@ -164,7 +152,7 @@ Requires(preun):    systemd
 Requires(postun):   systemd
 %endif
 
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+%if 0%{?rhel} == 6
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig
 Requires(preun):    /sbin/service
@@ -180,11 +168,7 @@ This package contains the director files.
 
 %package logwatch
 Summary:            Bacula Director logwatch scripts
-Group:              System Environment/Daemons
-# RHEL 5 does not support noarch subpackages
-%if 0%{?fedora} || 0%{?rhel} >= 6
 BuildArch:          noarch
-%endif
 Requires:           bacula-director = %{version}-%{release}
 Requires:           logwatch
 
@@ -197,7 +181,6 @@ This package contains logwatch scripts for Bacula Director.
 
 %package storage
 Summary:            Bacula storage daemon files
-Group:              System Environment/Daemons
 Requires:           bacula-common%{?_isa} = %{version}-%{release}
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 Requires:           bacula-libs-sql%{?_isa} = %{version}-%{release}
@@ -218,7 +201,7 @@ Requires(preun):    systemd
 Requires(postun):   systemd
 %endif
 
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+%if 0%{?rhel} == 6
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig
 Requires(preun):    /sbin/service
@@ -236,7 +219,6 @@ devices.
 
 %package client
 Summary:            Bacula backup client
-Group:              System Environment/Daemons
 Requires:           bacula-common%{?_isa} = %{version}-%{release}
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 
@@ -246,7 +228,7 @@ Requires(preun):    systemd
 Requires(postun):   systemd
 %endif
 
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+%if 0%{?rhel} == 6
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig
 Requires(preun):    /sbin/service
@@ -263,7 +245,6 @@ backed up.
 
 %package console
 Summary:            Bacula management console
-Group:              System Environment/Daemons
 Obsoletes:          bacula-console-gnome <= 2.4
 Obsoletes:          bacula-console-wxwidgets <= 5.0.3
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
@@ -276,10 +257,8 @@ based on a client/server architecture.
 This package contains the command-line management console for the bacula backup
 system.
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
 %package console-bat
 Summary:            Bacula bat console
-Group:              System Environment/Daemons
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 Requires:           dejavu-lgc-sans-fonts
 
@@ -292,7 +271,6 @@ This package contains the bat version of the bacula management console.
 
 %package traymonitor
 Summary:            Bacula system tray monitor
-Group:              System Environment/Daemons
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 Requires:           dejavu-lgc-sans-fonts
 
@@ -303,11 +281,9 @@ based on a client/server architecture.
 
 This package contains the Gnome and KDE compatible tray monitor to monitor your
 bacula server.
-%endif
 
 %package devel
 Summary:            Bacula development files
-Group:              Development/Libraries
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 Requires:           bacula-libs-sql%{?_isa} = %{version}-%{release}
 
@@ -320,7 +296,6 @@ This development package contains static libraries and header files.
 
 %package -n nagios-plugins-bacula
 Summary:            Nagios Plugin - check_bacula
-Group:              Applications/System
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 Requires:           nagios-common%{?_isa}
 
@@ -343,7 +318,6 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 find updatedb -type f | xargs chmod -x
 
 %build
-build() {
 export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 export PATH="$PATH:%{_qt4_bindir}"
@@ -351,6 +325,7 @@ export PATH="$PATH:%{_qt4_bindir}"
         --disable-conio \
         --disable-rpath \
         --docdir=%{_datadir}/bacula \
+        --enable-bat \
         --enable-batch-insert \
         --enable-build-dird \
         --enable-build-stored \
@@ -380,15 +355,7 @@ export PATH="$PATH:%{_qt4_bindir}"
         --with-subsys-dir=%{_localstatedir}/lock/subsys \
         --with-tcp-wrappers \
         --with-working-dir=%{_localstatedir}/spool/bacula \
-        --with-x \
+        --with-x
-        $*
-}
-
-%if 0%{?fedora} || 0%{?rhel} >= 6
-build --enable-bat
-%else
-build --disable-bat
-%endif
 
 # Remove RPATH
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -397,7 +364,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 make -C examples/nagios/check_bacula
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
 pushd src/qt-console/tray-monitor
     %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro
     make %{?_smp_mflags}
@@ -405,11 +371,9 @@ pushd src/qt-console/tray-monitor
 popd
 # Convert image to png for tray monitor icon
 convert %{SOURCE19} bacula-tray-monitor.png
-%endif
 
 %install
-rm -rf %{buildroot}
+%make_install
-make install DESTDIR=%{buildroot}
 
 # Nagios plugin
 install -p -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
@@ -418,7 +382,6 @@ install -p -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot
 rm -f %{buildroot}%{_libdir}/libbaccats.so
 rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
 # Bat
 install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat.png
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
@@ -430,10 +393,6 @@ install -p -m 644 -D manpages/bacula-tray-monitor.1 %{buildroot}%{_mandir}/man1/
 install -p -m 644 -D bacula-tray-monitor.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
 
-%else
-rm -f %{buildroot}%{_mandir}/man1/bat.1*
-%endif
-
 # Logrotate
 mkdir -p %{buildroot}%{_localstatedir}/log/bacula
 install -p -m 644 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/bacula
@@ -460,11 +419,7 @@ install -p -m 755 -D %{SOURCE9} %{buildroot}%{_initrddir}/bacula-sd
 # Sysconfig
 install -p -m 644 -D %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/bacula-fd
 install -p -m 644 -D %{SOURCE16} %{buildroot}%{_sysconfdir}/sysconfig/bacula-dir
-%if 0%{?fedora} || 0%{?rhel} >= 6
 install -p -m 644 -D %{SOURCE17} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
-%else
-install -p -m 644 -D %{SOURCE18} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
-%endif
 
 # Spool directory
 mkdir -p %{buildroot}%{_localstatedir}/spool/bacula
@@ -474,11 +429,7 @@ rm -f %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysq
 rm -f %{buildroot}%{_sbindir}/bacula
 rm -f %{buildroot}%{_mandir}/man8/bacula.8.gz
 rm -f %{buildroot}%{_libdir}/*.la
-%if 0%{?fedora} || 0%{?rhel} >= 6
 rm -f %{buildroot}%{_datadir}/bacula/{ChangeLog,INSTALL,LICENSE*,README,ReleaseNotes,VERIFYING,technotes}
-%else
-rm -rf %{buildroot}%{_datadir}/bacula
-%endif
 
 # Fix up some perms so rpmlint does not complain too much
 chmod 755 %{buildroot}%{_sbindir}/*
@@ -486,9 +437,6 @@ chmod 755 %{buildroot}%{_libdir}/bacula/*
 chmod 755 %{buildroot}%{_libexecdir}/bacula/*
 chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
 
-%clean
-rm -rf %{buildroot}
-
 %post libs
 /sbin/ldconfig
 
@@ -563,7 +511,7 @@ exit 0
 
 %endif
 
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+%if 0%{?rhel} == 6
 
 %post client
 /sbin/chkconfig --add bacula-fd
@@ -610,16 +558,13 @@ fi
 %endif
 
 %files libs
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc AUTHORS ChangeLog SUPPORT ReleaseNotes LICENSE-FAQ LICENSE-FOSS
-%defattr(-,root,root,-)
 %{_libdir}/libbac-%{version}.so
 %{_libdir}/libbaccfg-%{version}.so
 %{_libdir}/libbacfind-%{version}.so
 
 %files libs-sql
-%defattr(-,root,root,-)
 %{_libdir}/libbaccats-mysql-%{version}.so
 %{_libdir}/libbaccats-mysql.so
 %{_libdir}/libbaccats-postgresql-%{version}.so
@@ -629,7 +574,6 @@ fi
 %{_libdir}/libbacsql-%{version}.so
 
 %files common
-%defattr(-,root,root,-)
 %doc README.Redhat quickstart_*
 %config(noreplace) %{_sysconfdir}/logrotate.d/bacula
 %dir %{_localstatedir}/log/bacula %attr(750, bacula, bacula)
@@ -644,7 +588,6 @@ fi
 %{_sbindir}/btraceback
 
 %files director
-%defattr(-,root,root,-)
 %doc updatedb examples/sample-query.sql
 %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf %attr(640,root,bacula)
 %config(noreplace) %{_sysconfdir}/bacula/query.sql %attr(640,root,bacula)
@@ -692,14 +635,12 @@ fi
 %endif
 
 %files logwatch
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
 %config(noreplace) %{_sysconfdir}/logwatch/conf/services/bacula.conf
 %{_sysconfdir}/logwatch/scripts/services/bacula
 %{_sysconfdir}/logwatch/scripts/shared/applybaculadate
 
 %files storage
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf %attr(640,root,root)
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
 %{_libexecdir}/%{name}/disk-changer
@@ -726,7 +667,6 @@ fi
 
 
 %files client
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf %attr(640,root,root)
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
 %{_mandir}/man8/bacula-fd.8*
@@ -739,14 +679,11 @@ fi
 %endif
 
 %files console
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf %attr(640,root,root)
 %{_mandir}/man8/bconsole.8*
 %{_sbindir}/bconsole
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
 %files console-bat
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/bacula/bat.conf %attr(640,root,root)
 %{_datadir}/applications/bacula-bat.desktop
 %{_datadir}/bacula/*.html
@@ -756,16 +693,13 @@ fi
 %{_sbindir}/bat
 
 %files traymonitor
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %attr(640,root,root)
 %{_datadir}/applications/bacula-traymonitor.desktop
 %{_datadir}/pixmaps/bacula-tray-monitor.png
 %{_mandir}/man1/bacula-tray-monitor.1*
 %{_sbindir}/bacula-tray-monitor
-%endif
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/bacula
 %{_libdir}/libbac.so
 %{_libdir}/libbaccfg.so
@@ -773,10 +707,12 @@ fi
 %{_libdir}/libbacsql.so
 
 %files -n nagios-plugins-bacula
-%defattr(-,root,root)
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Wed Apr 05 2017 Simone Caronni <negativo17@gmail.com> - 7.4.7-2
+- Remove all RHEL/CentOS 5 compatibility.
+
 * Thu Mar 16 2017 Jon Ciesla <limburgher@gmail.com> - 7.4.7-1
 - Update to 7.4.7.