From 1acef02939ed612b2b0c34c4ca9244d47f0f30ec Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Jan 27 2010 08:45:33 +0000 Subject: - changes in spec file and init scritps (#226352) --- diff --git a/quagga-0.99.15-lsbhdr.patch b/quagga-0.99.15-lsbhdr.patch new file mode 100644 index 0000000..da67a28 --- /dev/null +++ b/quagga-0.99.15-lsbhdr.patch @@ -0,0 +1,108 @@ +diff -up quagga-0.99.15/redhat/bgpd.init.lsbhdr quagga-0.99.15/redhat/bgpd.init +--- quagga-0.99.15/redhat/bgpd.init.lsbhdr 2010-01-26 09:06:55.854903364 +0100 ++++ quagga-0.99.15/redhat/bgpd.init 2010-01-26 09:07:26.385905447 +0100 +@@ -1,8 +1,9 @@ + #!/bin/bash +-### BEGIN INIT INFO +-# Provides: bgpd + # chkconfig: - 16 84 + # config: /etc/quagga/bgpd.conf ++ ++### BEGIN INIT INFO ++# Provides: bgpd + # Short-Description: A BGPv4, BGPv4+, BGPv4- routing engine + # Description: A BGPv4, BGPv4+, BGPv4- routing engine for use with Zebra + ### END INIT INFO +diff -up quagga-0.99.15/redhat/isisd.init.lsbhdr quagga-0.99.15/redhat/isisd.init +--- quagga-0.99.15/redhat/isisd.init.lsbhdr 2010-01-26 09:07:38.577183863 +0100 ++++ quagga-0.99.15/redhat/isisd.init 2010-01-26 09:07:57.880904573 +0100 +@@ -1,10 +1,11 @@ + #!/bin/bash +-### BEGIN INIT INFO +-# Provides: isisd + # chkconfig: - 16 84 + # config: /etc/quagga/isisd.conf ++ ++### BEGIN INIT INFO ++# Provides: isisd + # Short-Description: An ISIS routing engine +-# description: An ISIS routing engine for use with Quagga ++# Description: An ISIS routing engine for use with Quagga + ### END INIT INFO + + # source function library +diff -up quagga-0.99.15/redhat/ospf6d.init.lsbhdr quagga-0.99.15/redhat/ospf6d.init +--- quagga-0.99.15/redhat/ospf6d.init.lsbhdr 2010-01-26 09:08:12.302153648 +0100 ++++ quagga-0.99.15/redhat/ospf6d.init 2010-01-26 09:08:24.141905152 +0100 +@@ -1,8 +1,9 @@ + #!/bin/bash +-### BEGIN INIT INFO +-# Provides: ospf6d + # chkconfig: - 16 84 + # config: /etc/quagga/ospf6d.conf ++ ++### BEGIN INIT INFO ++# Provides: ospf6d + # Short-Description: A OSPF routing engine for IPv6 + # Description: An OSPF routing engine for use with Zebra and IPv6 + ### END INIT INFO +diff -up quagga-0.99.15/redhat/ospfd.init.lsbhdr quagga-0.99.15/redhat/ospfd.init +--- quagga-0.99.15/redhat/ospfd.init.lsbhdr 2010-01-26 09:08:47.332938279 +0100 ++++ quagga-0.99.15/redhat/ospfd.init 2010-01-26 09:08:59.255952679 +0100 +@@ -1,8 +1,9 @@ + #!/bin/bash +-### BEGIN INIT INFO +-# Provides: ospfd + # chkconfig: - 16 84 + # config: /etc/quagga/ospfd.conf ++ ++### BEGIN INIT INFO ++# Provides: ospfd + # Short-Description: A OSPF v2 routing engine + # Description: An OSPF v2 routing engine for use with Zebra + ### END INIT INFO +diff -up quagga-0.99.15/redhat/ripd.init.lsbhdr quagga-0.99.15/redhat/ripd.init +--- quagga-0.99.15/redhat/ripd.init.lsbhdr 2010-01-26 09:09:17.379154898 +0100 ++++ quagga-0.99.15/redhat/ripd.init 2010-01-26 09:09:33.417905029 +0100 +@@ -1,8 +1,9 @@ + #!/bin/bash +-### BEGIN INIT INFO +-# Provides: ripd + # chkconfig: - 16 84 + # config: /etc/quagga/ripd.conf ++ ++### BEGIN INIT INFO ++# Provides: ripd + # Short-Description: A RIP routing engine + # Description: A RIP routing engine for use with Zebra + ### END INIT INFO +diff -up quagga-0.99.15/redhat/ripngd.init.lsbhdr quagga-0.99.15/redhat/ripngd.init +--- quagga-0.99.15/redhat/ripngd.init.lsbhdr 2010-01-26 09:09:45.168935194 +0100 ++++ quagga-0.99.15/redhat/ripngd.init 2010-01-26 09:10:02.713154585 +0100 +@@ -1,8 +1,9 @@ + #!/bin/bash +-### BEGIN INIT INFO +-# Provides: ripngd + # chkconfig: - 16 84 + # config: /etc/quagga/ripngd.conf ++ ++### BEGIN INIT INFO ++# Provides: ripngd + # Short-Description: A RIP routing engine for IPv6 + # Description: A RIP routing engine for use with Zebra and IPv6 + ### END INIT INFO +diff -up quagga-0.99.15/redhat/zebra.init.lsbhdr quagga-0.99.15/redhat/zebra.init +--- quagga-0.99.15/redhat/zebra.init.lsbhdr 2010-01-26 10:39:02.042238770 +0100 ++++ quagga-0.99.15/redhat/zebra.init 2010-01-26 10:39:18.070133989 +0100 +@@ -1,8 +1,9 @@ + #!/bin/bash +-### BEGIN INIT INFO +-# Provides: zebra + # chkconfig: - 15 85 + # config: /etc/quagga/zebra.conf ++ ++### BEGIN INIT INFO ++# Provides: zebra + # Short-Description: GNU Zebra routing manager + # Description: GNU Zebra routing manager + ### END INIT INFO diff --git a/quagga-0.99.15-perl_pth.patch b/quagga-0.99.15-perl_pth.patch new file mode 100644 index 0000000..e0e25e9 --- /dev/null +++ b/quagga-0.99.15-perl_pth.patch @@ -0,0 +1,9 @@ +diff -up quagga-0.99.15/tools/rrlookup.pl.perl_pth quagga-0.99.15/tools/rrlookup.pl +--- quagga-0.99.15/tools/rrlookup.pl.perl_pth 2010-01-26 10:46:58.705919109 +0100 ++++ quagga-0.99.15/tools/rrlookup.pl 2010-01-26 10:47:23.937134146 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/perl ++#!/usr/bin/perl + ## + ## Read BGPd logfile and lookup RR's whois database. + ## diff --git a/quagga.spec b/quagga.spec index f09e50c..63f515b 100644 --- a/quagga.spec +++ b/quagga.spec @@ -1,5 +1,5 @@ # configure options -%define with_snmp 0 +%define with_snmp 1 %define with_vtysh 1 %define with_ospf_te 1 %define with_nssa 1 @@ -32,8 +32,7 @@ Summary: Routing daemon Name: quagga Version: 0.99.15 -Release: 1%{?dist} -Epoch: 0 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz @@ -41,26 +40,28 @@ Source1: quagga-filter-perl-requires.sh Patch2: quagga-0.96.5-nostart.patch Patch7: quagga-0.99.9-initscript.patch Patch8: quagga-0.99.15-posix.patch +Patch9: quagga-0.99.15-lsbhdr.patch +Patch10: quagga-0.99.15-perl_pth.patch URL: http://www.quagga.net %if %with_snmp BuildRequires: net-snmp-devel -Prereq: net-snmp +Requires: net-snmp %endif %if %with_vtysh BuildRequires: readline readline-devel ncurses ncurses-devel -Prereq: ncurses +Requires: ncurses %endif BuildRequires: texinfo tetex autoconf pam-devel patch libcap-devel texi2html %define __perl_requires %{SOURCE1} # Initscripts > 5.60 is required for IPv6 support -Prereq: initscripts >= 5.60 -Prereq: ncurses pam +Requires: initscripts >= 5.60 +Requires: ncurses pam Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -Provides: routingdaemon -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Provides: routingdaemon = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Conflicts: bird gated mrt zebra %description @@ -77,7 +78,7 @@ Quagga by design has a process for each protocol. Quagga is a fork of GNU Zebra. %package contrib -Summary: contrib tools for quagga +Summary: Contrib tools for quagga Group: System Environment/Daemons %description contrib @@ -88,7 +89,7 @@ Summary: Header and object files for quagga development Group: System Environment/Daemons %description devel -The quagga-devel package contains the header and object files neccessary for +The quagga-devel package contains the header and object files necessary for developing OSPF-API and quagga applications. %prep @@ -97,6 +98,8 @@ developing OSPF-API and quagga applications. # This creates a .diff file that we apply after configuring %patch7 -p1 -b .initscript %patch8 -p1 -b .posix +%patch9 -p1 -b .lsbhdr +%patch10 -p1 -b .perl_pth %build # FC5+ automatic -fstack-protector-all switch @@ -312,7 +315,8 @@ rm -rf $RPM_BUILD_ROOT %dir %attr(750,root,root) /var/run/quagga %endif %if %vty_group -%attr(644,%quagga_user,%vty_group) %{_sysconfdir}/vtysh.conf.sample +# noreplace not used due to smaple conf file +%config %attr(644,%quagga_user,%vty_group) %{_sysconfdir}/vtysh.conf.sample %endif %{_infodir}/*info* %{_mandir}/man*/* @@ -322,6 +326,7 @@ rm -rf $RPM_BUILD_ROOT %endif %dir %{_libdir} %{_libdir}/*.so* +# noreplace not used due to smaple conf files %config /etc/quagga/[!v]* %attr(755,root,root) /etc/rc.d/init.d/* %config(noreplace) /etc/pam.d/quagga @@ -331,7 +336,7 @@ rm -rf $RPM_BUILD_ROOT %files contrib %defattr(-,root,root) -%doc tools +%doc %attr(0644,root,root) tools %files devel %defattr(-,root,root) @@ -348,6 +353,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jan 26 2010 Jiri Skala - 0.99.15-2 +- changes in spec file and init scritps (#226352) + * Mon Oct 19 2009 Jiri Skala - 0.99.15-1 - bump to latest upstream - fixed #527734 - posix compliant init scripts @@ -474,9 +482,9 @@ rm -rf $RPM_BUILD_ROOT Change /etc/logrotate.d/* to /etc/logrotate.d/quagga in this spec file. - Modify this spec file to move the .so files to the base package and close bz#140894 -- Modify this spec file to separate out %{_includedir}/quagga/ospfd - from .../*.h and %{_includedir}/quagga/ospfapi from .../*.h - Rpmbuild probably shouldn't allow %dir of a plain file. +- Modify this spec file to separate out macro <_includedir>/quagga/ospfd + from .../*.h and macro <_includedir>/quagga/ospfapi from .../*.h + Rpmbuild probably shouldn't allow macro of a plain file. * Wed Jan 12 2005 Tim Waugh 0.97.3-3 - Rebuilt for new readline.