summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO6
-rw-r--r--misc/bird.spec12
2 files changed, 10 insertions, 8 deletions
diff --git a/TODO b/TODO
index 315dc51..6b74e75 100644
--- 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 f307988..17f365d 100644
--- 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