- updated opt patch (no-PPPoE version)

- changed opt-pppoe patch - use DESTDIR when installing plugins
- s/no_cbcp/_without_cbcp/

Changed files:
    ppp-opt-pppoe.patch -> 1.3
    ppp-opt.patch -> 1.3
    ppp.spec -> 1.54

diff --git a/ppp-opt-pppoe.patch b/ppp-opt-pppoe.patch
index 35fd60358f23614c5dc5541a7b4280987ce8956d..2e27828941ff87f6d3fd8368f81961dde5c95746 100644 (file)
--- a/ppp-opt-pppoe.patch
+++ b/ppp-opt-pppoe.patch
@@ -1,6 +1,6 @@
-diff -urN ppp-2.4.1.org/pppd/plugins/Makefile.linux ppp-2.4.1/pppd/plugins/Makefile.linux
---- ppp-2.4.1.org/pppd/plugins/Makefile.linux  Sun Jun 10 23:07:47 2001
-+++ ppp-2.4.1/pppd/plugins/Makefile.linux      Sun Jun 10 23:09:13 2001
+diff -Nur ppp-2.4.1.orig/pppd/plugins/Makefile.linux ppp-2.4.1/pppd/plugins/Makefile.linux
+--- ppp-2.4.1.orig/pppd/plugins/Makefile.linux Tue Jun 12 16:58:26 2001
++++ ppp-2.4.1/pppd/plugins/Makefile.linux      Tue Jun 12 16:57:49 2001
 @@ -1,6 +1,6 @@
  CC    = gcc
 -CFLAGS        = -g -O2 -I.. -I../../include -fPIC
@@ -10,16 +10,20 @@ diff -urN ppp-2.4.1.org/pppd/plugins/Makefile.linux ppp-2.4.1/pppd/plugins/Makef
  INSTALL       = install
  
  all:  minconn.so passprompt.so pppoe/pppoe.so
-@@ -22,4 +22,4 @@
-       $(INSTALL) $? $(LIBDIR)/$$version
+@@ -18,8 +18,8 @@
+ 
+ install: minconn.so passprompt.so pppoe/pppoe.so
+       version=`awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h`; \
+-      $(INSTALL) -d $(LIBDIR)/$$version; \
+-      $(INSTALL) $? $(LIBDIR)/$$version
++      $(INSTALL) -d $(DESTDIR)$(LIBDIR)/$$version; \
++      $(INSTALL) $? $(DESTDIR)$(LIBDIR)/$$version
  
  clean:
--      rm -rf *.o *.so
-\ No newline at end of file
-+      rm -rf *.o *.so
-diff -urN ppp-2.4.1.org/pppd/plugins/pppoe/Makefile.linux ppp-2.4.1/pppd/plugins/pppoe/Makefile.linux
---- ppp-2.4.1.org/pppd/plugins/pppoe/Makefile.linux    Sun Jun 10 23:07:47 2001
-+++ ppp-2.4.1/pppd/plugins/pppoe/Makefile.linux        Sun Jun 10 23:08:06 2001
+       rm -rf *.o *.so
+diff -Nur ppp-2.4.1.orig/pppd/plugins/pppoe/Makefile.linux ppp-2.4.1/pppd/plugins/pppoe/Makefile.linux
+--- ppp-2.4.1.orig/pppd/plugins/pppoe/Makefile.linux   Tue Jun 12 16:56:19 2001
++++ ppp-2.4.1/pppd/plugins/pppoe/Makefile.linux        Tue Jun 12 16:57:49 2001
 @@ -1,6 +1,6 @@
  CC    = gcc
 -CFLAGS        = -g  -I.. -I../.. -I../../../include -D_linux_=1 -fPIC

diff --git a/ppp-opt.patch b/ppp-opt.patch
index 180ad0116691952aac1a41f29fda893d20862d23..d14fbfc68c1604b4d80bbf21a66ed32123ca7daa 100644 (file)
--- a/ppp-opt.patch
+++ b/ppp-opt.patch
@@ -1,9 +1,18 @@
---- ppp-2.4.0/pppd/plugins/Makefile.linux~     Sun Jan 14 17:44:33 2001
-+++ ppp-2.4.0/pppd/plugins/Makefile.linux      Sun Jan 14 17:47:04 2001
+--- ppp-2.4.1/pppd/plugins/Makefile.linux.orig Wed Mar  7 05:21:18 2001
++++ ppp-2.4.1/pppd/plugins/Makefile.linux      Tue Jun 12 16:24:56 2001
 @@ -1,5 +1,5 @@
  CC    = gcc
--CFLAGS        = -g -O2 -I.. -I../../include
-+CFLAGS        += -I.. -I../../include
+-CFLAGS        = -g -O2 -I.. -I../../include -fPIC
++CFLAGS        += -I.. -I../../include -fPIC
  LDFLAGS       = -shared
+ INSTALL       = install
  
- all:  minconn.so passprompt.so
+@@ -15,5 +15,5 @@
+ 
+ install: minconn.so passprompt.so
+       version=`awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h`; \
+-      $(INSTALL) -d $(LIBDIR)/$$version; \
+-      $(INSTALL) $? $(LIBDIR)/$$version
+\ No newline at end of file
++      $(INSTALL) -d $(DESTDIR)$(LIBDIR)/$$version; \
++      $(INSTALL) $? $(DESTDIR)$(LIBDIR)/$$version

diff --git a/ppp.spec b/ppp.spec
index bb551ee9972575ef087ec6b89520518278d17f64..c7a7bdee3f2d8ba73f29c19e608a725a0ca436ed 100644 (file)
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,5 +1,6 @@
 #
 # _without_pppoe - without PPPoE support (which requires kernel 2.4)
+# _without_cbcp - without CBCP (MS CallBack Configuration Protocol)
 Summary:       ppp daemon package for linux 2.2.11 and greater
 Summary(de):   ppp-Dämonpaket für Linux 2.2.11 und höher 
 Summary(fr):   Paquetage du démon ppp pour Linux 2.2.11 et supérieur
@@ -76,7 +77,7 @@ Hat 
 %build
 %configure
 %{__make} OPT_FLAGS="%{rpmcflags}" \
-       %{!?no_cbcp:CBCP=1}
+       %{!?_without_cbcp:CBCP=1}
 
 %install
 rm -rf $RPM_BUILD_ROOT