[ppp/f14/master] * Thu Aug 05 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-11 - fixes #617625 - FTBFS in ppp due to ch

[Jiri Skala]

commit 3f274f3c3a63515eebf55962252f9fa68dd00388
Author: Jiri Skala <jskala at localhost.localdomain>
Date:   Thu Aug 5 16:42:02 2010 +0200

    * Thu Aug 05 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-11
    - fixes #617625 - FTBFS in ppp due to change in kernel-headers
    - fixes pppol2tp Makefile

 ppp-2.4.4-lib64.patch |   13 +++++++++++++
 ppp.spec              |   10 ++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/ppp-2.4.4-lib64.patch b/ppp-2.4.4-lib64.patch
index a3a1cf6..b842048 100644
--- a/ppp-2.4.4-lib64.patch
+++ b/ppp-2.4.4-lib64.patch
@@ -74,3 +74,16 @@
  #else /* __STDC__ */
  #define _PATH_PLUGIN	"/usr/lib/pppd"
  #endif /* __STDC__ */
+--- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux.lib64	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux	2010-08-05 16:33:53.964898629 +0200
+@@ -6,8 +6,8 @@
+ 
+ #***********************************************************************
+ 
+-DESTDIR = @DESTDIR@
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++DESTDIR = $(INSTROOT)@DESTDIR@
++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
+ 
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
diff --git a/ppp.spec b/ppp.spec
index 5ec9bd6..0b19654 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,7 +1,7 @@
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
 Version: 2.4.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -76,7 +76,9 @@ rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
 rm -f scripts/*.usepeerdns-var_run_ppp_resolv
 rm -f scripts/*.ppp_resolv
-find . -type f -name "*.sample" | xargs rm -f 
+find . -type f -name "*.sample" | xargs rm -f
+
+rm -f include/linux/if_pppol2tp.h
 
 %build
 #find . -name 'Makefile*' -print0 | xargs -0 perl -pi.no_strip -e "s: -s : :g"
@@ -139,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Thu Aug 05 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-11
+- fixes #617625 - FTBFS in ppp due to change in kernel-headers
+- fixes pppol2tp Makefile
+
 * Tue Jul 13 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-10
 - fixes #613717 - Missing line in example script ip-up.local.add
 - removed /usr/kerberos/include from eaptls patch