X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=bird.spec;h=8e249ff4dbf7eb7a4ae09841a4a05c977e7546d4;hb=HEAD;hp=acc9ffec80967954985d183b17a56b103fa7e03b;hpb=a88802b142ff551ceb35341f6fce6e03668cfd5c;p=packages%2Fbird.git

diff --git a/bird.spec b/bird.spec
index acc9ffe..8e249ff 100644
--- a/bird.spec
+++ b/bird.spec
@@ -9,20 +9,23 @@
 Summary:	The BIRD Internet Routing Daemon
 Summary(pl.UTF-8):	Demon BIRD Internetowego Routingu Dynamicznego
 Name:		bird
-Version:	1.4.4
+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:	4ec3a9165928a541326ec9de316da974
+Source0:	https://bird.network.cz/download/%{name}-%{version}.tar.gz
+# Source0-md5:	abe29a927e21a3d7f8092641f06093c2
 Source1:	%{name}-ipv4.init
 Source2:	%{name}-ipv4.sysconfig
 Source3:	%{name}-ipv6.init
 Source4:	%{name}-ipv6.sysconfig
-Source5:	ftp://bird.network.cz/pub/bird/%{name}-doc-%{version}.tar.gz
-# Source5-md5:	f7509f89b4700b881cbcb64190767dec
+Source5:	https://bird.network.cz/download/%{name}-doc-%{version}.tar.gz
+# Source5-md5:	d5b69caeee629479e0261aba18d35758
+Source6:	%{name}-ipv4.service
+Source7:	%{name}-ipv6.service
 Patch0:		%{name}-allowalien.patch
-URL:		http://bird.network.cz/
+Patch1:		gcc.patch
+URL:		https://bird.network.cz/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
@@ -107,12 +110,13 @@ filtrów o dużych możliwościach.
 %prep
 %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"
+export CFLAGS="%{rpmcflags} -I%{_includedir}/ncursesw -fno-strict-aliasing -fno-strict-overflow"
 
 %if %{with ipv6}
 %configure \
@@ -136,7 +140,8 @@ 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}
 
@@ -145,6 +150,7 @@ 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}
@@ -156,6 +162,7 @@ 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
@@ -174,30 +181,46 @@ 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 doc/reply_codes %{name}-doc-%{version}/doc/*.ps ChangeLog NEWS README TODO
+%doc doc/*.html doc/reply_codes %{name}-doc-%{version}/doc/*.pdf ChangeLog NEWS README 
 %attr(755,root,root) %{_sbindir}/birdc
 
 %if %{with ipv4}
@@ -207,6 +230,7 @@ chgrp bird /etc/bird.conf
 %attr(754,root,root) /etc/rc.d/init.d/bird-ipv4
 %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}
@@ -217,4 +241,5 @@ chgrp bird /etc/bird.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