- more fixes for CBCP:

-- added CBCP patch,
-- in default configuration pppd is builded with CBCP but pass --define
   "without-cbcp 1" to rpm parameters allow build pppd without CBCP.

Changed files:
    ppp.spec -> 1.35

diff --git a/ppp.spec b/ppp.spec
index 316e31c6ada0921e297d38f49fea9921b3a3203f..a775f09f47cf6e3814ef137c2c3a614bdfdb98cc 100644 (file)
--- a/ppp.spec
+++ b/ppp.spec
@@ -18,6 +18,7 @@ Patch1:               %{name}-expect.patch
 Patch2:                %{name}-debian_scripts.patch
 Patch3:                %{name}-static.patch
 Patch4:                %{name}-ipv6.patch
+Patch5:                %{name}-CBCP.patch
 BuildRequires: pam-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,10 +57,11 @@ Hat 
 %patch2 -p1 
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure
-%{__make} OPT_FLAGS="$RPM_OPT_FLAGS -DCBCP_SUPPORT"
+%{__make} OPT_FLAGS="$RPM_OPT_FLAGS" %{!?without_cbcp:CBCP=1}
 
 %install
 rm -rf $RPM_BUILD_ROOT