[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/quagga/FC-3 quagga-0.98.2-gcc4.patch, NONE, 1.1 quagga.spec, 1.12, 1.13 sources, 1.7, 1.8



Update of /cvs/dist/rpms/quagga/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv24318

Modified Files:
	quagga.spec sources 
Added Files:
	quagga-0.98.2-gcc4.patch 
Log Message:
0.98.3


quagga-0.98.2-gcc4.patch:
 ospfclient/ospfclient.c |    1 +
 ospfd/ospf_lsdb.c       |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE quagga-0.98.2-gcc4.patch ---
--- quagga-0.98.2/ospfd/#ospf_lsdb.c~	2005-03-08 15:15:02.000000000 -0500
+++ quagga-0.98.2/ospfd/ospf_lsdb.c	2005-03-08 15:14:15.000000000 -0500
@@ -25,6 +25,7 @@
 #include "prefix.h"
 #include "table.h"
 #include "memory.h"
+#include "log.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_asbr.h"
--- quagga-0.98.2/ospfclient/#ospfclient.c~	2005-03-08 15:08:00.000000000 -0500
+++ quagga-0.98.2/ospfclient/ospfclient.c	2005-03-08 15:08:00.000000000 -0500
@@ -12,6 +12,7 @@
 #include <zebra.h>
 #include "prefix.h" /* needed by ospf_asbr.h */
 #include "privs.h"
+#include "log.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_asbr.h"


Index: quagga.spec
===================================================================
RCS file: /cvs/dist/rpms/quagga/FC-3/quagga.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- quagga.spec	29 Nov 2004 18:24:19 -0000	1.12
+++ quagga.spec	4 Apr 2005 19:20:10 -0000	1.13
@@ -31,7 +31,7 @@
 
 Summary: Routing daemon
 Name:		quagga
-Version:	0.97.3
+Version:	0.98.3
 Release: 1.FC3
 Epoch: 0
 License:	GPL
@@ -41,6 +41,8 @@
 #Patch0:         quagga-0.96.2-lib64.patch
 Patch1:         quagga-0.96.3-netlink.patch
 Patch2:		quagga-0.96.5-nostart.patch
+Patch3:		quagga-0.98.2-gcc4.patch
+
 URL:		http://www.quagga.net
 %if %with_snmp
 BuildRequires:	ucd-snmp-devel
@@ -48,7 +50,7 @@
 %endif
 %if %with_vtysh
 BuildRequires:	readline readline-devel ncurses ncurses-devel
-Prereq:		readline ncurses
+Prereq:		ncurses
 %endif
 BuildRequires:	texinfo tetex autoconf pam-devel patch libcap-devel
 %define __perl_requires %{SOURCE1}
@@ -94,6 +96,7 @@
 #%patch0 -p1 -b .lib64
 %patch1 -p1 -b .netlink
 %patch2 -p1 -b .nostart
+%patch3 -p1 -b .gcc4
 
 %build
 CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
@@ -121,7 +124,7 @@
 %if %with_vtysh
 	--enable-vtysh \
 %endif
-%if %with_ospfclient 
+%if %with_ospfclient
 	--enable-ospfclient=yes \
 %else
 	--enable-ospfclient=no\
@@ -142,7 +145,7 @@
 	--enable-vty-group=%vty_group \
 %endif
 %if %with_rtadv
-	--with-rtadv \
+	--enable-rtadv \
 %endif
 --with-cflags="-O2" \
 --enable-netlink
@@ -202,7 +205,7 @@
 #
 #zebra_spec_add_service ()
 #{
-#  # Add port /etc/services entry if it isn't already there 
+#  # Add port /etc/services entry if it isn't already there
 #  if [ -f /etc/services ] && ! grep -q "^$1[^a-zA-Z0-9]" /etc/services ; then
 #    echo "$1		$2			# $3"  >> /etc/services
 #  fi
@@ -223,7 +226,7 @@
 #zebra_spec_add_service ospfapi  2607/tcp "OSPF-API"
 #%endif
 
-/sbin/chkconfig --add zebra 
+/sbin/chkconfig --add zebra
 /sbin/chkconfig --add ripd
 %if %with_ipv6
 /sbin/chkconfig --add ripngd
@@ -287,7 +290,7 @@
 %doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES TODO
 %if %quagga_user
 %dir %attr(751,%quagga_user,%quagga_user) %{_sysconfdir}
-%dir %attr(770,%quagga_user,%quagga_user) /var/log/quagga 
+%dir %attr(770,%quagga_user,%quagga_user) /var/log/quagga
 %dir %attr(771,%quagga_user,%quagga_user) /var/run/quagga
 %else
 %dir %attr(750,root,root) %{_sysconfdir}
@@ -309,8 +312,8 @@
 %config /etc/quagga/[!v]*
 %config /etc/rc.d/init.d/*
 %config(noreplace) /etc/pam.d/quagga
-%config(noreplace) %attr(640,root,root) /etc/logrotate.d/*
-%config(noreplace) /etc/sysconfig/quagga                  
+%config(noreplace) %attr(640,root,root) /etc/logrotate.d/quagga
+%config(noreplace) /etc/sysconfig/quagga
 
 
 %files contrib
@@ -331,6 +334,14 @@
 %endif
 
 %changelog
+* Mon Apr 4 2005 Jay Fenlason <fenlason redhat com> 0.98.3-1.FC3
+- New uptreasm release
+- Merge changes from trunk, including the -gcc4 patch (won't hurt with
+  older compilers), change --with-rtadv to --enable-rtadv,
+  change /etc/logrotate.d/* to /etc/logrotate.d/quagga in this spec file,
+  and don't explicitly require readline.  Also remove trailing whitespace
+  from this spec file.
+
 * Mon Nov 29 2004 Jay Fenlason <fenlason redhat com> 0.97.3-1
 - New upstream release.  This fixes #140827 and #140913
 - Fix #140894 by reorging which rpms the .so files are in.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/quagga/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Nov 2004 18:24:19 -0000	1.7
+++ sources	4 Apr 2005 19:20:10 -0000	1.8
@@ -1 +1 @@
-51d1020edcba2c8b334261c766142574  quagga-0.97.3.tar.gz
+68be5e911e4d604c0f5959338263356e  quagga-0.98.3.tar.gz


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]