X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bird.spec;h=cc52d09c9e6419fc8eacd88ed8ab57674e31bc35;hb=97a5aa47e447775ccff43353fb3b43455b66c1bd;hp=61d452a1244d3d8aad8d5f7f8ee27cf15c25fbe8;hpb=bf003f2546e6ea6ec38a32412894b0459df38d9f;p=packages%2Fbird.git

diff --git a/bird.spec b/bird.spec
index 61d452a..cc52d09 100644
--- a/bird.spec
+++ b/bird.spec
@@ -4,22 +4,27 @@
 # Conditional build:
 %bcond_without	ipv6	# disable IPv6 support (and building bird-ipv6 package)
 %bcond_without	ipv4	# disable IPv4 support (and building bird-ipv4 package)
+%bcond_with	alien	# enable possibility to import 'alien' routes import into bird's routing table
 #
-Summary:	Routing daemon
-Summary(pl.UTF-8):   Demon dynamicznego routingu
+Summary:	The BIRD Internet Routing Daemon
+Summary(pl.UTF-8):	Demon BIRD Internetowego Routingu Dynamicznego
 Name:		bird
-Version:	1.0.11
-Release:	2
-License:	GPL
+Version:	1.6.8
+Release:	1
+License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://bird.network.cz/pub/bird/%{name}-%{version}.tar.gz
-# Source0-md5:	9f9dfe2af0bde45a0adbbd0ebc36f249
+# Source0-md5:	abe29a927e21a3d7f8092641f06093c2
 Source1:	%{name}-ipv4.init
 Source2:	%{name}-ipv4.sysconfig
 Source3:	%{name}-ipv6.init
 Source4:	%{name}-ipv6.sysconfig
-Patch0:		%{name}-flex.patch
-Patch1:		%{name}-64bit.patch
+Source5:	ftp://bird.network.cz/pub/bird/%{name}-doc-%{version}.tar.gz
+# Source5-md5:	d5b69caeee629479e0261aba18d35758
+Source6:	%{name}-ipv4.service
+Source7:	%{name}-ipv6.service
+Patch0:		%{name}-allowalien.patch
+Patch1:		gcc.patch
 URL:		http://bird.network.cz/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -30,6 +35,8 @@ BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	bird-daemon
 Requires:	rc-scripts
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/usr/sbin/useradd
 Obsoletes:	gated
 Obsoletes:	mrt
 Obsoletes:	zebra
@@ -50,7 +57,7 @@ filtrów o dużych możliwościach.
 
 %package ipv4
 Summary:	Routing daemon for IPv4
-Summary(pl.UTF-8):   Demon dynamicznego routingu IPv4
+Summary(pl.UTF-8):	Demon dynamicznego routingu IPv4
 Group:		Networking/Daemons
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
@@ -76,7 +83,7 @@ filtrów o dużych możliwościach.
 
 %package ipv6
 Summary:	Routing daemon for IPv6
-Summary(pl.UTF-8):   Demon dynamicznego routingu IPv6
+Summary(pl.UTF-8):	Demon dynamicznego routingu IPv6
 Group:		Networking/Daemons
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
@@ -101,15 +108,17 @@ protokołów routingu, łatwym interfejsem konfiguracji i językiem
 filtrów o dużych możliwościach.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -a 5
+%{?with_alien:%patch0 -p1}
 %patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* tools
+%{__autoconf}
+
+export CFLAGS="%{rpmcflags} -I%{_includedir}/ncursesw -fno-strict-aliasing -fno-strict-overflow"
 
 %if %{with ipv6}
-%{__autoconf}
 %configure \
 	--disable-memcheck \
 	--enable-client \
@@ -131,53 +140,87 @@ mv bird bird-6
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig,%{_sbindir}} \
+	$RPM_BUILD_ROOT%{systemdunitdir}
 
 install birdc $RPM_BUILD_ROOT%{_sbindir}
 
-%if %{with ipv6}
+%if %{with ipv4}
 install bird $RPM_BUILD_ROOT%{_sbindir}
 install doc/bird.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ipv4
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ipv4
+install %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-ipv4.service
 %endif
 
 %if %{with ipv6}
 install bird-6 $RPM_BUILD_ROOT%{_sbindir}
 cat <<EOF > $RPM_BUILD_ROOT%{_sbindir}/birdc-6
 #!/bin/sh
-exec %{_sbindir}/birdc -s /var/run/bird-6.ctl
+exec %{_sbindir}/birdc -s /var/run/bird6.ctl
 EOF
+:> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}6.conf
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ipv6
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ipv6
+install %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-ipv6.service
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%groupadd -g 271 bird
+%useradd -u 271 -d /usr/share/empty -s /bin/false -c "bird routing daemon" -g bird bird
+
+%postun
+if [ "$1" = "0" ]; then
+	%userremove bird
+	%groupremove bird
+fi
+
 %post ipv4
 /sbin/chkconfig --add %{name}-ipv4
 %service %{name}-ipv4 restart "routing daemon"
+%systemd_post %{name}-ipv4.service
 
 %preun ipv4
 if [ "$1" = "0" ]; then
 	%service %{name}-ipv4 stop
 	/sbin/chkconfig --del %{name}-ipv4
 fi
+%systemd_preun %{name}-ipv4.service
+
+%postun ipv4
+%systemd_reload
 
 %post ipv6
 /sbin/chkconfig --add %{name}-ipv6
 %service %{name}-ipv6 restart "routing daemon"
+%systemd_post %{name}-ipv6.service
 
 %preun ipv6
 if [ "$1" = "0" ]; then
 	%service %{name}-ipv6 stop
 	/sbin/chkconfig --del %{name}-ipv6
 fi
+%systemd_preun %{name}-ipv6.service
+
+%postun ipv6
+%systemd_reload
+
+%triggerpostun ipv4 -- %{name}-ipv4 < 1.3.4-3
+chmod 0640 /etc/bird.conf
+chgrp bird /etc/bird.conf
+
+%triggerpostun -- %{name}-ipv4 < 1.4.5-2
+%systemd_trigger %{name}-ipv4.service
+
+%triggerpostun -- %{name}-ipv6 < 1.4.5-2
+%systemd_trigger %{name}-ipv6.service
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*.html TODO README
+%doc doc/*.html doc/reply_codes %{name}-doc-%{version}/doc/*.pdf ChangeLog NEWS README 
 %attr(755,root,root) %{_sbindir}/birdc
 
 %if %{with ipv4}
@@ -185,8 +228,9 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/bird
 %attr(754,root,root) /etc/rc.d/init.d/bird-ipv4
-%attr(754,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bird-ipv4
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bird.conf
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bird-ipv4
+%attr(640,root,bird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bird.conf
+%{systemdunitdir}/%{name}-ipv4.service
 %endif
 
 %if %{with ipv6}
@@ -194,7 +238,8 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/bird-6
 %attr(755,root,root) %{_sbindir}/birdc-6
-%attr(754,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bird-ipv6
-%attr(754,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/rc.d/init.d/bird-ipv6
-#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bird-6.conf
+%attr(754,root,root) /etc/rc.d/init.d/bird-ipv6
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bird-ipv6
+%attr(640,root,bird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bird6.conf
+%{systemdunitdir}/%{name}-ipv6.service
 %endif