Accepting request 435709 from home:Andreas_Schwab:Factory

- fix-header-conflict.patch: avoid conflict with kernel headers

OBS-URL: https://build.opensuse.org/request/show/435709
OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=36

ppp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ppp
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -71,6 +71,7 @@ Patch22:        ppp-2.4.4-var_run_resolv_conf.patch
 Patch23:        ppp-send-padt.patch
 # PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310
 Patch24:        ppp-CVE-2015-3310.patch
+Patch25:        fix-header-conflict.patch
 
 %description
 The ppp package contains the PPP (Point-to-Point Protocol) daemon,
@@ -112,6 +113,7 @@ plugins for the pppd.
 %patch22
 %patch23 -p1
 %patch24
+%patch25 -p1
 sed -i -e '1s/local\///' scripts/secure-card
 find scripts -type f | xargs chmod a-x
 find -type f -name '*.orig' | xargs rm -f