From 31c98471f2296f36c282b3da2a7fae85328e9989 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Tue, 6 Jun 2017 15:03:54 -0700 Subject: [PATCH] redhat: Fix changelog to be in correct format and order --- redhat/frr.spec.in | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index c5e6775f3b..3bc36cd053 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -89,18 +89,18 @@ %define daemon_ldpd "" %endif -%if %{with_nhrpd} -%define daemon_nhrpd nhrpd -%else -%define daemon_nhrpd "" -%endif - %if %{with_pimd} %define daemon_pimd pimd %else %define daemon_pimd "" %endif +%if %{with_nhrpd} +%define daemon_nhrpd nhrpd +%else +%define daemon_nhrpd "" +%endif + %if %{with_watchfrr} %define daemon_watchfrr watchfrr %else @@ -557,13 +557,10 @@ rm -rf %{buildroot} %endif %changelog -* Tue Feb 14 2017 Timo Teräs - %{version} -- add nhrpd +* Mon Jun 5 2017 Martin Winter - %{version} +- added NHRP daemon -* Fri Jan 6 2017 Martin Winter - %{version} -* Thu Apr 13 2017 Martin Winter - %{version} -* Thu Apr 17 2017 Martin Winter - %{version} -* Mon Apr 17 2017 Martin Winter - %{version} +* Thu Apr 17 2017 Martin Winter - new subpackage frr-pythontools with python 2.7 restart script - remove PIMd from CentOS/RedHat 6 RPM packages (won't work - too old) - converted to single frr init script (not per daemon) based on debian init script