Fix FTBFS in rawhide. Do not use glibc headers to avoid redefinition

This commit is contained in:
Pavel Zhukov 2017-04-15 06:27:21 +02:00
parent aad0aefdb2
commit 30b926ad1f
2 changed files with 23 additions and 7 deletions

View File

@ -0,0 +1,13 @@
diff --git a/includes.h b/includes.h
index d2449c4..08ae63d 100644
--- a/includes.h
+++ b/includes.h
@@ -86,7 +86,7 @@
#include <net/if_types.h>
#endif
-#if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)
+#if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) && !defined(HAVE_LINUX_IF_ARP_H)
#include <net/if_arp.h>
#endif /* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */

View File

@ -1,7 +1,7 @@
Summary: A Router Advertisement daemon
Name: radvd
Version: 2.14
Release: 2%{?dist}
Release: 3%{?dist}
# The code includes the advertising clause, so it's GPL-incompatible
License: BSD with advertising
Group: System Environment/Daemons
@ -9,12 +9,10 @@ URL: http://www.litech.org/radvd/
Source0: %{url}dist/%{name}-%{version}.tar.xz
Source1: radvd-tmpfs.conf
Source2: radvd.service
# radvdump: show routes with prefixlen > 64
#
# https://bugzilla.redhat.com/show_bug.cgi?id=1188891
# https://github.com/reubenhwk/radvd/pull/42
#
# Submitted upstream.
# https://github.com/reubenhwk/radvd/pull/70
# https://bugzilla.redhat.com/show_bug.cgi?id=1438730
Patch0: radvd-2.14-headers_conflict.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: flex-static
@ -39,6 +37,8 @@ services.
%prep
%setup -q
%patch0 -p1
for F in CHANGES; do
iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new"
touch -r "$F" "${F}.new"
@ -100,6 +100,9 @@ exit 0
%{_sbindir}/radvdump
%changelog
* Sat Apr 15 2017 Pavel Zhukov <landgraf@fedoraproject.org> -2.14-3
- FTBFS Do not use glibc headers if linux ones are available (#143873)
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild