From 865a10937ffb70a0c0c794e7f6b8fa6aa1c4e8c7 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 17 Jun 2003 16:22:57 +0000
Subject: [PATCH] - updated make patch, use %%configure in radiusclient to use
 proper optflags - headers are installed by make install now, no need to do it
 manually

Changed files:
    ppp-make.patch -> 1.11
    ppp.spec -> 1.101
---
 ppp-make.patch | 22 ++++++++++++++++++++++
 ppp.spec       | 22 +++++++++++++++-------
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/ppp-make.patch b/ppp-make.patch
index b67a92d..6eab101 100644
--- a/ppp-make.patch
+++ b/ppp-make.patch
@@ -124,3 +124,25 @@ diff -urN ppp-2.4.2-20020809.org/pppstats/Makefile.linux ppp-2.4.2-20020809/ppps
  	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)/man8/pppstats.8
  
  pppstats: $(PPPSTATSRCS)
+--- ppp-2.4.2-20030613/pppd/plugins/rp-pppoe/Makefile.linux.orig	2003-06-17 00:58:36.000000000 +0200
++++ ppp-2.4.2-20030613/pppd/plugins/rp-pppoe/Makefile.linux	2003-06-17 08:04:52.000000000 +0200
+@@ -16,7 +16,7 @@
+ # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
+ VERSION=3.5
+ 
+-CFLAGS+=-I../../../include/linux
++CFLAGS+=-I../../../include/linux $(OPT_FLAGS)
+ all: rp-pppoe.so
+ 
+ rp-pppoe.so: libplugin.a plugin.o
+--- ppp-2.4.2-20030613/pppd/plugins/radius/Makefile.linux.orig	2002-10-05 06:35:24.000000000 +0200
++++ ppp-2.4.2-20030613/pppd/plugins/radius/Makefile.linux	2003-06-17 08:02:16.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ MANDIR=/usr/man
+ PLUGIN=radius.so radattr.so radrealms.so
+-CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2
++CFLAGS=-I../.. -I../../../include -Iradiusclient/include $(OPT_FLAGS)
+ 
+ # Uncomment the next line to include support for Microsoft's
+ # MS-CHAP authentication protocol.
diff --git a/ppp.spec b/ppp.spec
index a47f726..991ed5d 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,4 +1,7 @@
+#
+# Conditional build:
 # _with_pppoatm - with PPPoATM support (which requires kernel 2.4 and atm-devel)
+#
 # TODO:
 # - fix ppp over atm
 %define snap	20030613
@@ -35,8 +38,9 @@ Patch5:		%{name}-pidfile-owner.patch
 Patch6:		%{name}-rp-pppoe-update.patch
 Patch7:		%{name}-rp-pppoe-macaddr.patch
 URL:		http://www.samba.org/ppp/
-BuildRequires:	pam-devel
+BuildRequires:	automake
 %{?_with_pppoatm:BuildRequires:	linux-atm-devel}
+BuildRequires:	pam-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -104,7 +108,15 @@ Pliki nag
 %patch7 -p1
 
 %build
-find pppd/plugins/radius/radiusclient -exec touch "{}" ";"
+cd pppd/plugins/radius/radiusclient
+# touch seems no longer needed?
+#find . -exec touch "{}" ";"
+cp -f /usr/share/automake/config.* .
+%configure2_13 \
+	--enable-shared \
+	--enable-static
+cd ../../../..
+# note: not autoconf configure
 %configure
 %{__make} \
 	OPT_FLAGS="%{rpmcflags}" \
@@ -114,8 +126,7 @@ find pppd/plugins/radius/radiusclient -exec touch "{}" ";"
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man{1,8}} \
 	$RPM_BUILD_ROOT{%{_sysconfdir}/{pam.d,ppp/peers},/var/log} \
-	$RPM_BUILD_ROOT/etc/logrotate.d \
-	$RPM_BUILD_ROOT/%{_includedir}/pppd
+	$RPM_BUILD_ROOT/etc/logrotate.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -129,9 +140,6 @@ install debian/pap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp
 install debian/options $RPM_BUILD_ROOT%{_sysconfdir}/ppp
 install debian/options.ttyXX $RPM_BUILD_ROOT%{_sysconfdir}/ppp
 
-install pppd/patchlevel.h $RPM_BUILD_ROOT/%{_includedir}/pppd
-install pppd/pppd.h $RPM_BUILD_ROOT/%{_includedir}/pppd
-
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/ppp
-- 
2.44.0