RPM is now able to build IPv4 and IPv6 bird.

diff --git a/TODO b/TODO
index 315dc5178696559117c85546f8aa8490189685ab..6b74e758a9e7a0b337a51062aa63444f3f139e69 100644 (file)
--- a/TODO
+++ b/TODO
@@ -19,12 +19,6 @@ Globals
 - protocols: implement reconfigure hook
 - protocols: use locking
 - check use of system includes and sprintf()
-- refuse to run twice on single system
-
-
-RPM
-~~~
-- build v4 and v6 in once
 
 Various ideas
 ~~~~~~~~~~~~~

diff --git a/misc/bird.spec b/misc/bird.spec
index f307988eb48a0295c45792d6d9741cd87d9b18c6..17f365d9bc441ba508ace023ff82db28c34bf007 100644 (file)
--- a/misc/bird.spec
+++ b/misc/bird.spec
@@ -18,16 +18,22 @@ protocols BGP, RIP and OSPF.
 %setup -n bird-%{version}
 
 %build
+./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/run --enable-ipv6
+make
+mv bird bird6
 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/run
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT/*
 make install prefix=$RPM_BUILD_ROOT/usr sysconfdir=$RPM_BUILD_ROOT/etc localstatedir=$RPM_BUILD_ROOT/var/run
+install bird6 $RPM_BUILD_ROOT/usr/sbin
 
 cd $RPM_BUILD_ROOT
-install -c -d etc/rc.d/init.d
-install -c $RPM_SOURCE_DIR/bird.init etc/rc.d/init.d/bird
+install -d etc/rc.d/init.d
+install $RPM_SOURCE_DIR/bird.init etc/rc.d/init.d/bird
+install $RPM_SOURCE_DIR/birdc6 usr/bin/
 
 %post
 /sbin/ldconfig
@@ -40,6 +46,8 @@ fi
 
 %files
 %attr(755,root,root) /usr/sbin/bird
+%attr(755,root,root) /usr/sbin/bird6
 %attr(755,root,root) /usr/sbin/birdc
+%attr(755,root,root) /usr/sbin/birdc6
 %attr(755,root,root) /etc/rc.d/init.d/bird
 %config /etc/bird.conf