rpms/quagga/F-8 quagga-0.99.9-initscript.patch, 1.1, 1.2 quagga.spec, 1.40, 1.41

[Martin Bacovsky (mbacovsk)]

Author: mbacovsk

Update of /cvs/pkgs/rpms/quagga/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30450

Modified Files:
	quagga-0.99.9-initscript.patch quagga.spec 
Log Message:
* Mon Nov 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-3
- resolves: #376821: ospfd init script looks for ospf6 configuration and lock file
- resolves: #376841: Usage string in ospf6d init script incorrect


quagga-0.99.9-initscript.patch:

Index: quagga-0.99.9-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/F-8/quagga-0.99.9-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quagga-0.99.9-initscript.patch	12 Nov 2007 15:04:06 -0000	1.1
+++ quagga-0.99.9-initscript.patch	12 Nov 2007 16:28:32 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up quagga-0.99.9/redhat/ospf6d.init.initscript quagga-0.99.9/redhat/ospf6d.init
---- quagga-0.99.9/redhat/ospf6d.init.initscript	2007-11-12 15:21:51.000000000 +0100
-+++ quagga-0.99.9/redhat/ospf6d.init	2007-11-12 15:33:15.000000000 +0100
+--- quagga-0.99.9/redhat/ospf6d.init.initscript	2007-11-12 17:14:25.000000000 +0100
++++ quagga-0.99.9/redhat/ospf6d.init	2007-11-12 17:15:18.000000000 +0100
 @@ -1,10 +1,11 @@
  #!/bin/bash
 -#
@@ -81,14 +81,14 @@
    *)
 -	echo $"Usage: $prog {start|stop|restart|reload|condrestart|status}"
 -	exit 1
-+	echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
++	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
 +	exit 2
  esac
  
  exit $RETVAL
 diff -up quagga-0.99.9/redhat/isisd.init.initscript quagga-0.99.9/redhat/isisd.init
---- quagga-0.99.9/redhat/isisd.init.initscript	2007-11-12 15:21:51.000000000 +0100
-+++ quagga-0.99.9/redhat/isisd.init	2007-11-12 15:21:51.000000000 +0100
+--- quagga-0.99.9/redhat/isisd.init.initscript	2007-11-12 17:14:25.000000000 +0100
++++ quagga-0.99.9/redhat/isisd.init	2007-11-12 17:14:25.000000000 +0100
 @@ -1,10 +1,11 @@
  #!/bin/bash
 -#
@@ -175,8 +175,8 @@
  
  exit $RETVAL
 diff -up quagga-0.99.9/redhat/ospfd.init.initscript quagga-0.99.9/redhat/ospfd.init
---- quagga-0.99.9/redhat/ospfd.init.initscript	2007-11-12 15:21:51.000000000 +0100
-+++ quagga-0.99.9/redhat/ospfd.init	2007-11-12 15:32:50.000000000 +0100
+--- quagga-0.99.9/redhat/ospfd.init.initscript	2007-11-12 17:14:25.000000000 +0100
++++ quagga-0.99.9/redhat/ospfd.init	2007-11-12 17:15:04.000000000 +0100
 @@ -1,10 +1,11 @@
  #!/bin/bash
 -#
@@ -256,16 +256,15 @@
  	RETVAL=$?
          ;;
    *)
--	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ 	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
 -	exit 1
-+	echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
 +	exit 2
  esac
  
  exit $RETVAL
 diff -up quagga-0.99.9/redhat/watchquagga.init.initscript quagga-0.99.9/redhat/watchquagga.init
 --- quagga-0.99.9/redhat/watchquagga.init.initscript	2004-12-22 04:02:46.000000000 +0100
-+++ quagga-0.99.9/redhat/watchquagga.init	2007-11-12 15:21:51.000000000 +0100
++++ quagga-0.99.9/redhat/watchquagga.init	2007-11-12 17:14:25.000000000 +0100
 @@ -1,9 +1,10 @@
  #!/bin/bash
 -#
@@ -348,8 +347,8 @@
  
  exit $RETVAL
 diff -up quagga-0.99.9/redhat/bgpd.init.initscript quagga-0.99.9/redhat/bgpd.init
---- quagga-0.99.9/redhat/bgpd.init.initscript	2007-11-12 15:21:51.000000000 +0100
-+++ quagga-0.99.9/redhat/bgpd.init	2007-11-12 15:21:51.000000000 +0100
+--- quagga-0.99.9/redhat/bgpd.init.initscript	2007-11-12 17:14:25.000000000 +0100
++++ quagga-0.99.9/redhat/bgpd.init	2007-11-12 17:14:25.000000000 +0100
 @@ -1,10 +1,11 @@
  #!/bin/bash
 -#
@@ -436,8 +435,8 @@
  
  exit $RETVAL
 diff -up quagga-0.99.9/redhat/ripngd.init.initscript quagga-0.99.9/redhat/ripngd.init
---- quagga-0.99.9/redhat/ripngd.init.initscript	2007-11-12 15:21:51.000000000 +0100
-+++ quagga-0.99.9/redhat/ripngd.init	2007-11-12 15:21:51.000000000 +0100
+--- quagga-0.99.9/redhat/ripngd.init.initscript	2007-11-12 17:14:25.000000000 +0100
++++ quagga-0.99.9/redhat/ripngd.init	2007-11-12 17:14:25.000000000 +0100
 @@ -1,10 +1,11 @@
  #!/bin/bash
 -#
@@ -523,8 +522,8 @@
  
  exit $RETVAL
 diff -up quagga-0.99.9/redhat/zebra.init.initscript quagga-0.99.9/redhat/zebra.init
---- quagga-0.99.9/redhat/zebra.init.initscript	2007-11-12 15:21:51.000000000 +0100
-+++ quagga-0.99.9/redhat/zebra.init	2007-11-12 15:21:51.000000000 +0100
+--- quagga-0.99.9/redhat/zebra.init.initscript	2007-11-12 17:14:25.000000000 +0100
++++ quagga-0.99.9/redhat/zebra.init	2007-11-12 17:14:25.000000000 +0100
 @@ -1,10 +1,11 @@
  #!/bin/bash
 -#
@@ -614,8 +613,8 @@
  
  exit $RETVAL
 diff -up quagga-0.99.9/redhat/ripd.init.initscript quagga-0.99.9/redhat/ripd.init
---- quagga-0.99.9/redhat/ripd.init.initscript	2007-11-12 15:21:51.000000000 +0100
-+++ quagga-0.99.9/redhat/ripd.init	2007-11-12 15:21:51.000000000 +0100
+--- quagga-0.99.9/redhat/ripd.init.initscript	2007-11-12 17:14:25.000000000 +0100
++++ quagga-0.99.9/redhat/ripd.init	2007-11-12 17:14:25.000000000 +0100
 @@ -1,10 +1,11 @@
  #!/bin/bash
 -#


Index: quagga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/F-8/quagga.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- quagga.spec	12 Nov 2007 15:04:06 -0000	1.40
+++ quagga.spec	12 Nov 2007 16:28:32 -0000	1.41
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.9
-Release:    2%{?dist}
+Release:    3%{?dist}
 Epoch:      0
 License:	GPL
 Group:      System Environment/Daemons
@@ -347,7 +347,7 @@
 %endif
 
 %changelog
-* Mon Nov 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-2
+* Mon Nov 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-3
 - resolves: #376821: ospfd init script looks for ospf6 configuration and lock file
 - resolves: #376841: Usage string in ospf6d init script incorrect