Accepting request 57136 from home:a_jaeger:branches:openSUSE:Factory

I fix the i586 build failure too :)

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

ppp.spec

@@ -21,14 +21,14 @@
 Name:           ppp
 BuildRequires:  libpcap-devel linux-atm-devel pam-devel
 Url:            http://www.samba.org/ppp/
-Version:        2.4.5_git200910141435
-Release:        2
+Version:        2.4.5
+Release:        3
 License:        BSD3c(or similar) ; LGPLv2.1+
 Group:          Productivity/Networking/PPP
 AutoReqProv:    on
 Summary:        The Point to Point Protocol for Linux
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        ftp://ftp.samba.org:/pub/ppp/ppp-%{PACKAGE_VERSION}.tar.bz2
+Source0:        ftp://ftp.samba.org:/pub/ppp/ppp-%{version}.tar.bz2
 # config for pam
 Source1:        ppp.pamd
 # templates for secrets
@@ -63,7 +63,6 @@ Patch8:         ppp-2.4.2-ifname.diff
 # Don't use __P from glibc (pppd uses it wrong)
 Patch9:         ppp-2.4.2-__P.diff
 Patch10:        ppp-2.4.3-pppoatm.diff
-Patch11:        ppp-makedevice.patch
 Patch12:        ppp-2.4.2-pie.patch
 Patch13:        ppp-2.4.3-demand-fix.diff
 Patch14:        ppp-2.4.3-fork-fix.diff
@@ -125,7 +124,6 @@ Authors:
 %patch8
 %patch9
 %patch10 -p1
-# %patch11
 %patch12 -p1
 %patch13
 %patch14
@@ -139,11 +137,14 @@ Authors:
 sed -i -e '1s/local\///' scripts/secure-card
 
 %build
+# Remove local copy that is out of sync and use the one from linux-header
+rm -f include/linux/if_pppol2tp.h
 export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP"
 ./configure --prefix=/usr
 make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y
 
 %install
+rm README.orig
 make install DESTDIR=%{buildroot}%_prefix
 install -d -m 750		%{buildroot}/etc/ppp
 install -m 644 %{S:5}		%{buildroot}/etc/ppp/options