2004-09-11 Paul Jakma <paul@dishone.st>

        * doc/quagga.texi: Update copyright. Contents should be at beginning
          of docs...
	* redhat/quagga.spec.in: wee keep_build define, to keep build dir.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 243ff96c1b2274891943db470ee20a57d59342ef..bb2e47715a5023609830fc29365a3dc27ebcaa33 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11 Paul Jakma <paul@dishone.st>
+
+       * quagga.texi: Update copyright. Contents should be at beginning
+         of docs...
+
 2004-09-11 Paul Jakma <paul@dishone.st>
 
        * ospfd.texi: OSPF MD5 auth requires stable time.

diff --git a/doc/quagga.texi b/doc/quagga.texi
index cb192a60f782ecf323a73d7339edf16d63db551c..487ac94278e865f1edeb522b1da588e9aee3f0d4 100644 (file)
--- a/doc/quagga.texi
+++ b/doc/quagga.texi
@@ -32,7 +32,7 @@ TCP/IP routing protocols.
 This is Edition @value{EDITION}, last updated @value{UPDATED} of
 @cite{The Quagga Manual}, for Quagga Version @value{VERSION}.
 
-Copyright (C) 1999, 2000, 2001, 2002 Kunihiro Ishiguro
+Copyright (C) 1999-2004 Kunihiro Ishiguro, et al.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -65,7 +65,7 @@ approved by Kunihiro Ishiguro.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1999, 2000, 2001, 2002 Kunihiro Ishiguro
+Copyright @copyright{} 1999-2004 Kunihiro Ishiguro, et al.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -114,6 +114,8 @@ quagga-@value{VERSION}. Quagga is a fork of GNU Zebra.
 * Command Index::               
 * VTY Key Index::               
 @end menu
+@summarycontents
+@contents
 
 @include overview.texi
 @include install.texi
@@ -145,6 +147,4 @@ quagga-@value{VERSION}. Quagga is a fork of GNU Zebra.
 
 @printindex ky
 
-@summarycontents
-@contents
 @bye

diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index fcfc7589b60d163e55a2ad2492e02d28533fbd57..738464f8a424ee93f274f7e3d63b8cd7ff85bd20 100644 (file)
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -36,6 +36,9 @@
 %define                daemon_list     zebra ripd isisd ospfd bgpd
 %endif
 
+# allow build dir to be kept
+%define                keep_build      0
+
 Summary: Routing daemon
 Name:          quagga
 Version:       @VERSION@
@@ -250,7 +253,9 @@ if [ "$1" = "0" ]; then
 fi
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+%if !%{keep_build}
+rm -rf $RPM_BUILD_ROOT
+%endif
 
 %files
 %defattr(-,root,root)