Install the systemd unit file, not the init script.

This commit is contained in:
Ryan O'Hara 2013-07-22 09:45:16 -05:00
parent 1b350c844e
commit 5c6debeb7d

View File

@ -8,13 +8,13 @@
Name: keepalived Name: keepalived
Summary: High Availability monitor built upon LVS, VRRP and service pollers Summary: High Availability monitor built upon LVS, VRRP and service pollers
Version: 1.2.7 Version: 1.2.7
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://www.keepalived.org/ URL: http://www.keepalived.org/
Group: System Environment/Daemons Group: System Environment/Daemons
Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
Source1: keepalived.init Source1: keepalived.service
Patch0: keepalived-1.2.7-dont-respawn-children.patch Patch0: keepalived-1.2.7-dont-respawn-children.patch
Patch1: keepalived-1.2.7-cleanup-duplicate-option-code.patch Patch1: keepalived-1.2.7-cleanup-duplicate-option-code.patch
@ -79,12 +79,13 @@ infrastructures.
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
rm -rf %{buildroot}%{_initrddir}/
rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/ rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service
%if %{with snmp} %if %{with snmp}
mkdir -p %{buildroot}%{_datadir}/snmp/mibs/ mkdir -p %{buildroot}%{_datadir}/snmp/mibs/
%{__install} -p -m 0644 doc/KEEPALIVED-MIB %{buildroot}%{_datadir}/snmp/mibs/KEEPALIVED-MIB.txt %{__install} -p -D -m 0644 doc/KEEPALIVED-MIB %{buildroot}%{_datadir}/snmp/mibs/KEEPALIVED-MIB.txt
%endif %endif
%clean %clean
@ -109,17 +110,20 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/keepalived/ %dir %{_sysconfdir}/keepalived/
%config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf %config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
%config(noreplace) %{_sysconfdir}/sysconfig/keepalived %config(noreplace) %{_sysconfdir}/sysconfig/keepalived
%{_sysconfdir}/rc.d/init.d/keepalived
%if %{with snmp} %if %{with snmp}
%{_datadir}/snmp/mibs/KEEPALIVED-MIB.txt %{_datadir}/snmp/mibs/KEEPALIVED-MIB.txt
%endif %endif
%{_bindir}/genhash %{_bindir}/genhash
%{_unitdir}/keepalived.service
%{_sbindir}/keepalived %{_sbindir}/keepalived
%{_mandir}/man1/genhash.1* %{_mandir}/man1/genhash.1*
%{_mandir}/man5/keepalived.conf.5* %{_mandir}/man5/keepalived.conf.5*
%{_mandir}/man8/keepalived.8* %{_mandir}/man8/keepalived.8*
%changelog %changelog
* Mon Jul 22 2013 Ryan O'Hara <rohara@redhat.com> - 1.2.7-6
- Install the systemd unit file, not the init script.
* Mon Apr 22 2013 Ryan O'Hara <rohara@redhat.com> - 1.2.7-5 * Mon Apr 22 2013 Ryan O'Hara <rohara@redhat.com> - 1.2.7-5
- Build with PIE flags (#955150) - Build with PIE flags (#955150)