diff --git a/resource-agents.spec.in b/resource-agents.spec.in
index 6f5257fbc..6a778ebef 100644
--- a/resource-agents.spec.in
+++ b/resource-agents.spec.in
@@ -1,405 +1,403 @@
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
 # file, is the same license as for the pristine package itself (unless the
 # license for the pristine package is not an Open Source License, in which
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
 
 %global rcver @rcver@
 %global alphatag @alphatag@
 %global numcomm @numcomm@
 %global dirty @dirty@
 
 # Whether this platform defaults to using systemd as an init system
 # (needs to be evaluated prior to BuildRequires being enumerated and
 # installed as it's intended to conditionally select some of these, and
 # for that there are only few indicators with varying reliability:
 # - presence of systemd-defined macros (when building in a full-fledged
 #   environment, which is not the case with ordinary mock-based builds)
 # - systemd-aware rpm as manifested with the presence of particular
 #   macro (rpm itself will trivially always be present when building)
 # - existence of /usr/lib/os-release file, which is something heavily
 #   propagated by systemd project
 # - when not good enough, there's always a possibility to check
 #   particular distro-specific macros (incl. version comparison)
 %define systemd_native (%{?_unitdir:1}%{!?_unitdir:0}%{nil \
   } || %{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \
   } || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?))
 
 #
 # Since this spec file supports multiple distributions, ensure we
 # use the correct group for each.
 #
 
 # SSLeay (required by ldirectord)
 %if 0%{?suse_version}
 %global SSLeay perl-Net_SSLeay
 %else
 %global SSLeay perl-Net-SSLeay
 %endif
 
 # determine the ras-set to process based on configure invokation
 %bcond_@rgmanager@ rgmanager
 %bcond_@linux-ha@ linuxha
 
 # build with HA_BIN compatibility for the existing Heartbeat stack
 %bcond_@compat-habindir@ compat_habindir
 %if %{with compat_habindir}
 %global _libexecdir %{_libdir}
 %endif
 
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	@version@
 Release:	@specver@%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_ver} || 0%{?rhel}
 Group:		System Environment/Base
 %else
 Group:		Productivity/Clustering/HA
 %endif
 Source0:	%{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.bz2
 Obsoletes:	heartbeat-resources <= %{version}
 Provides:	heartbeat-resources = %{version}
 
 ## Setup/build bits
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: perl
 BuildRequires: libxslt glib2-devel
 BuildRequires: which
 
 %if 0%{?fedora} || 0%{?centos_ver} || 0%{?rhel}
 BuildRequires: cluster-glue-libs-devel
 BuildRequires: docbook-style-xsl docbook-dtds
 %if 0%{?rhel} == 0
 BuildRequires: libnet-devel
 %endif
 %endif
 
 %if 0%{?suse_version}
 %if 0%{?suse_version} >= 1140
 BuildRequires:  libnet1
 %else
 BuildRequires:  libnet
 %endif
 BuildRequires:  libglue-devel
 BuildRequires:  libxslt docbook_4 docbook-xsl-stylesheets
 %endif
 
 ## Runtime deps
 # system tools shared by several agents
 %if 0%{?centos_ver} > 6 || 0%{?rhel} > 6
 Requires: /usr/bin/gawk
 Requires: /usr/bin/ps
 Requires: /usr/sbin/fuser /usr/bin/mount
-Requires: hostname
 %else
 Requires: /bin/gawk
 Requires: /bin/ps
 Requires: /sbin/fuser /bin/mount
-Requires: /bin/hostname
 %endif
-Requires: /usr/bin/pkill /bin/netstat
+Requires: /usr/bin/pkill /bin/hostname /bin/netstat
 
 # Filesystem / fs.sh / netfs.sh
 %if 0%{?centos_ver} > 6 || 0%{?rhel} > 6
 Requires: /usr/sbin/fsck
 Requires: /usr/sbin/fsck.ext2 /usr/sbin/fsck.ext3 /usr/sbin/fsck.ext4
 Requires: /usr/sbin/fsck.xfs
 Requires: /usr/sbin/mount.cifs
 %else
 Requires: /sbin/fsck
 Requires: /sbin/fsck.ext2 /sbin/fsck.ext3 /sbin/fsck.ext4
 %if 0%{?rhel} == 0
 Requires: /sbin/fsck.xfs
 %endif
 Requires: /sbin/mount.cifs
 %endif
 Requires: /sbin/mount.nfs /sbin/mount.nfs4
 
 # IPaddr2
 %if 0%{?centos_ver} > 6 || 0%{?rhel} > 6
 Requires: /usr/sbin/ip
 %else
 Requires: /sbin/ip
 %endif
 
 # LVM / lvm.sh
 %if 0%{?centos_ver} > 6 || 0%{?rhel} > 6
 Requires: /usr/sbin/lvm
 %else
 Requires: /sbin/lvm
 %endif
 
 # nfsserver / netfs.sh
 Requires: /usr/sbin/rpc.nfsd /sbin/rpc.statd /usr/sbin/rpc.mountd
 
 # rgmanager
 %if %{with rgmanager}
 # ip.sh
 Requires: /usr/sbin/ethtool
 Requires: /sbin/rdisc /usr/sbin/arping /bin/ping /bin/ping6
 
 #nfsexport.sh
 Requires: /sbin/findfs
 Requires: /sbin/quotaon /sbin/quotacheck
 %endif
 
 %description
 A set of scripts to interface with several services to operate in a
 High Availability environment for both Pacemaker and rgmanager
 service managers.
 
 %if %{with linuxha}
 %package -n ldirectord
 License:	GPLv2+
 Summary:	A Monitoring Daemon for Maintaining High Availability Resources
 %if 0%{?fedora} || 0%{?centos_ver} || 0%{?rhel}
 Group:		System Environment/Daemons
 %else
 Group:		Productivity/Clustering/HA
 %endif
 Obsoletes:	heartbeat-ldirectord <= %{version}
 Provides:	heartbeat-ldirectord = %{version}
 %if 0%{?fedora} > 18 || 0%{?centos_ver} > 6 || 0%{?rhel} > 6
 BuildRequires: perl-podlators
 %endif
 Requires:       %{SSLeay} perl-libwww-perl perl-MailTools
 Requires:       ipvsadm logrotate
 %if 0%{?fedora}
 Requires:	perl-Net-IMAP-Simple-SSL
 Requires(post):	/sbin/chkconfig
 Requires(preun):/sbin/chkconfig
 %endif
 %if %{systemd_native}
 BuildRequires:  systemd
 %endif
 %{?systemd_requires}
 
 %description -n ldirectord
 The Linux Director Daemon (ldirectord) was written by Jacob Rief.
 <jacob.rief@tiscover.com>
 
 ldirectord is a stand alone daemon for monitoring the services on real
 servers. Currently, HTTP, HTTPS, and FTP services are supported.
 ldirectord is simple to install and works with Pacemaker
 (http://clusterlabs.org/).
 
 See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 %endif
 
 %prep
 %if 0%{?suse_version} == 0 && 0%{?fedora} == 0 && 0%{?centos_ver} == 0 && 0%{?rhel} == 0
 %{error:Unable to determine the distribution/version. This is generally caused by missing /etc/rpm/macros.dist. Please install the correct build packages or define the required macros manually.}
 exit 1
 %endif
 %setup -q -n %{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
 
 %build
 if [ ! -f configure ]; then
 	./autogen.sh
 fi
 
 %if 0%{?fedora} >= 11 || 0%{?centos_ver} > 5 || 0%{?rhel} > 5
 CFLAGS="$(echo '%{optflags}')"
 %global conf_opt_fatal "--enable-fatal-warnings=no"
 %else
 CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
 %global conf_opt_fatal "--enable-fatal-warnings=yes"
 %endif
 
 %if %{with rgmanager}
 %global rasset rgmanager
 %endif
 %if %{with linuxha}
 %global rasset linux-ha
 %endif
 %if %{with rgmanager} && %{with linuxha}
 %global rasset all
 %endif
 
 export CFLAGS
 
 %configure \
 	%{?conf_opt_rsctmpdir:%conf_opt_rsctmpdir} \
 	%{conf_opt_fatal} \
 %if %{defined _unitdir}
     --with-systemdsystemunitdir=%{_unitdir} \
 %endif
 %if %{defined _tmpfilesdir}
     --with-systemdtmpfilesdir=%{_tmpfilesdir} \
 %endif
 	--with-pkg-name=%{name} \
 	--with-ras-set=%{rasset}
 
 %if %{defined jobs}
 JFLAGS="$(echo '-j%{jobs}')"
 %else
 JFLAGS="$(echo '%{_smp_mflags}')"
 %endif
 
 make $JFLAGS
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 ## tree fixup
 # remove docs (there is only one and they should come from doc sections in files)
 rm -rf %{buildroot}/usr/share/doc/resource-agents
 
 %if %{with linuxha}
 %if 0%{?suse_version}
 test -d %{buildroot}/sbin || mkdir %{buildroot}/sbin
 (
   cd %{buildroot}/sbin
 %if %{defined _unitdir}
   ln -s /usr/sbin/service rcldirectord
 %else
   ln -sf /%{_sysconfdir}/init.d/ldirectord rcldirectord
 %endif
 ) || true
 %endif
 %endif
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.GPLv3 COPYING.LGPL ChangeLog
 %if %{with linuxha}
 %doc doc/README.webapps
 %doc %{_datadir}/%{name}/ra-api-1.dtd
 %doc %{_datadir}/%{name}/metadata.rng
 %endif
 
 %if %{with rgmanager}
 %{_datadir}/cluster
 %{_sbindir}/rhev-check.sh
 %endif
 
 %if %{with linuxha}
 %dir /usr/lib/ocf
 %dir /usr/lib/ocf/resource.d
 %dir /usr/lib/ocf/lib
 
 /usr/lib/ocf/lib/heartbeat
 
 /usr/lib/ocf/resource.d/heartbeat
 %if %{with rgmanager}
 /usr/lib/ocf/resource.d/redhat
 %endif
 
 %if %{defined _unitdir}
 %{_unitdir}/resource-agents-deps.target
 %endif
 %if %{defined _tmpfilesdir}
 %{_tmpfilesdir}/%{name}.conf
 %endif
 
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/ocft
 %{_datadir}/%{name}/ocft/configs
 %{_datadir}/%{name}/ocft/caselib
 %{_datadir}/%{name}/ocft/helpers.sh
 %{_datadir}/%{name}/ocft/runocft
 %{_datadir}/%{name}/ocft/runocft.prereq
 %{_datadir}/%{name}/ocft/README
 %{_datadir}/%{name}/ocft/README.zh_CN
 
 %{_sbindir}/ocf-tester
 %{_sbindir}/ocft
 %{_sbindir}/sfex_init
 %{_sbindir}/sfex_stat
 
 %{_includedir}/heartbeat
 
 %dir %attr (1755, root, root)	%{_var}/run/resource-agents
 
 %{_mandir}/man7/*.7*
 %{_mandir}/man8/ocf-tester.8*
 %{_mandir}/man8/sfex_init.8*
 
 # For compatability with pre-existing agents
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/shellfuncs
 
 %{_libexecdir}/heartbeat
 
 %post -n resource-agents
 if [ $1 = 2 ]; then
  if [ -d %{_var}/run/heartbeat/rsctmp ]; then
   cp -fpr %{_var}/run/heartbeat/rsctmp/* %{_var}/run/resource-agents/ 1>/dev/null 2>&1
   rm -fr %{_var}/run/heartbeat/rsctmp
  fi
 fi
 %if %{with rgmanager}
 ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %if 0%{?suse_version}
 %preun -n ldirectord
 %if %{defined _unitdir}
 %service_del_preun ldirectord.service
 %else
 %stop_on_removal ldirectord
 %endif
 %postun -n ldirectord
 %if %{defined _unitdir}
 %service_del_postun ldirectord.service
 %else
 %insserv_cleanup
 %endif
 %post -n ldirectord
 %if %{defined _unitdir}
 %service_add_post ldirectord.service
 %endif
 %pre -n ldirectord
 %if %{defined _unitdir}
 %service_add_pre ldirectord.service
 %endif
 %endif
 
 %if 0%{?fedora}
 %preun -n ldirectord
 /sbin/chkconfig --del ldirectord
 %postun -n ldirectord -p /sbin/ldconfig
 %post -n ldirectord
 /sbin/chkconfig --add ldirectord
 %endif
 
 %files -n ldirectord
 %defattr(-,root,root)
 %{_sbindir}/ldirectord
 %doc ldirectord/ldirectord.cf COPYING
 %{_mandir}/man8/ldirectord.8*
 %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
 %dir %{_sysconfdir}/ha.d
 %dir %{_sysconfdir}/ha.d/resource.d
 %{_sysconfdir}/ha.d/resource.d/ldirectord
 %if %{defined _unitdir}
 %{_unitdir}/ldirectord.service
 %exclude %{_sysconfdir}/init.d/ldirectord
 %else
 %{_sysconfdir}/init.d/ldirectord
 %endif
 %if 0%{?suse_version}
 /sbin/rcldirectord
 %endif
 %if 0%{?fedora}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 %endif
 %endif
 
 %changelog
 * @date@ Autotools generated version <nobody@nowhere.org> - @version@-@specver@-@numcomm@.@alphatag@.@dirty@
 - Autotools generated version