net-tools patch tunnel to allow building

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>

SOURCES/net-tools-if-tunnel-struct.patch

@@ -0,0 +1,10 @@
+--- net-tools-2.0/iptunnel.c	2019-04-30 11:03:52.330000000 +0200
++++ net-tools-2.0/iptunnel.c	2019-04-30 11:03:58.640000000 +0200
+@@ -26,7 +26,6 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+-#include <netinet/ip.h>
+ #include <arpa/inet.h>
+ #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
+ #include <net/if.h>

SPECS/net-tools.spec

@@ -68,6 +68,9 @@ Patch24: net-tools-netstat-sctp-man.patch
 # output of interface names was restricted to 8-10 characters max
 Patch25: net-tools-interface-name-len.patch
 
+# avoid redefinition tunnel struct
+Patch100: net-tools-if-tunnel-struct.patch
+
 BuildRequires: gettext, libselinux
 BuildRequires: libselinux-devel
 BuildRequires: systemd-units
@@ -107,15 +110,18 @@ cp %SOURCE8 ./man/en_US
 %patch24 -p1 -b .sctp-man
 %patch25 -p1 -b .interface-name-len
 
+%patch100 -p1
+
 touch ./config.h
 
 %build
 # Sparc and s390 arches need to use -fPIE
-%ifarch sparcv9 sparc64 s390 s390x
-export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fPIE"
-%else
-export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fpie"
-%endif
+#%ifarch sparcv9 sparc64 s390 s390x
+#export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fPIE"
+#%else
+#export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fpie"
+#%endif
+export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
 # RHBZ #853193
 export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro -Wl,-z,now"