quagga.logrotate: remove generic weekly and nocompress options

quagga.spec.in: build snmp support, update prequisites ucd-snmp to net-snmp

diff --git a/redhat/quagga.logrotate b/redhat/quagga.logrotate
index 58cbe7f02613df9d5f73d25d306aeef80696495f..a6494381ed9035fc7f94f6c1c9c81cbf63708b94 100644 (file)
--- a/redhat/quagga.logrotate
+++ b/redhat/quagga.logrotate
@@ -1,8 +1,6 @@
 /var/log/quagga/zebra.log {
     notifempty
     missingok
-    nocompress
-    weekly
     postrotate
        /usr/sbin/killall -USR1 zebra
     endscript
@@ -11,8 +9,6 @@
 /var/log/quagga/bgpd.log {
     notifempty
     missingok
-    nocompress
-    weekly
     postrotate
        /usr/sbin/killall -USR1 bgpd
     endscript
@@ -21,8 +17,6 @@
 /var/log/quagga/ospfd.log {
     notifempty
     missingok
-    nocompress
-    weekly
     postrotate
        /usr/sbin/killall -USR1 ospfd
     endscript
@@ -31,8 +25,6 @@
 /var/log/quagga/ospf6d.log {
     notifempty
     missingok
-    nocompress
-    weekly
     postrotate
        /usr/sbin/killall -USR1 ospf6d
     endscript
@@ -41,8 +33,6 @@
 /var/log/quagga/ripd.log {
     notifempty
     missingok
-    nocompress
-    weekly
     postrotate
        /usr/sbin/killall -USR1 ripd
     endscript
@@ -51,8 +41,6 @@
 /var/log/quagga/ripngd.log {
     notifempty
     missingok
-    nocompress
-    weekly
     postrotate
        /usr/sbin/killall -USR1 ripngd
     endscript

diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index f3b87b92704d3d0c0df45a67c31782e1dc0510ff..fcfc7589b60d163e55a2ad2492e02d28533fbd57 100644 (file)
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -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
@@ -45,8 +45,8 @@ Group: System Environment/Daemons
 Source0:       http://www.quagga.net/snapshots/cvs/%{name}-%{version}.tar.gz
 URL:           http://www.quagga.net
 %if %with_snmp
-BuildRequires: ucd-snmp-devel
-Prereq:                ucd-snmp
+BuildRequires: net-snmp-devel
+Prereq:                net-snmp
 %endif
 %if %with_vtysh
 BuildRequires: readline readline-devel ncurses ncurses-devel