[ppp/f13/master] * Thu Aug 05 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-10 - fixes #572174 - pppol2tp plugins not i

[Jiri Skala]

commit 6259d0c0196926fb8d1eeb73d4ad2c2492757d63
Author: Jiri Skala <jskala at localhost.localdomain>
Date:   Thu Aug 5 16:58:55 2010 +0200

    * Thu Aug 05 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-10
    - fixes #572174 - pppol2tp plugins not installed
    - removed proprietary if_pppol2tp.h

 ppp-2.4.4-lib64.patch |   13 +++++++++++++
 ppp.spec              |    8 +++++++-
 2 files changed, 20 insertions(+), 1 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 4381946..350dcaa 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: 9%{?dist}
+Release: 10%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -78,6 +78,8 @@ rm -f scripts/*.usepeerdns-var_run_ppp_resolv
 rm -f scripts/*.ppp_resolv
 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"
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall"
@@ -137,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Thu Aug 05 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-10
+- fixes #572174 - pppol2tp plugins not installed
+- removed proprietary if_pppol2tp.h
+
 * Tue Jul 13 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-9
 - fixes #613717 - Missing line in example script ip-up.local.add