rpms/kdenetwork/devel kdenetwork-3.5.7-ppp.patch, NONE, 1.1 kdenetwork.spec, 1.101, 1.102

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24240

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.7-ppp.patch 
Log Message:
* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
- +Requires: jasper (kopete yahoo support)


kdenetwork-3.5.7-ppp.patch:

--- NEW FILE kdenetwork-3.5.7-ppp.patch ---
diff -up kdenetwork-3.5.7/kppp/pppstats.cpp.ppp kdenetwork-3.5.7/kppp/pppstats.cpp
--- kdenetwork-3.5.7/kppp/pppstats.cpp.ppp	2006-03-17 05:12:34.000000000 -0500
+++ kdenetwork-3.5.7/kppp/pppstats.cpp	2007-08-29 09:15:50.000000000 -0400
@@ -69,6 +69,7 @@
  #ifndef HAVE_NET_IF_PPP_H
   #ifdef HAVE_LINUX_IF_PPP_H
    #include <linux/if.h>
+   #include <linux/ppp_defs.h>
    #include <linux/if_ppp.h>
   #endif
  #else
diff -up kdenetwork-3.5.7/kppp/configure.in.in.ppp kdenetwork-3.5.7/kppp/configure.in.in
--- kdenetwork-3.5.7/kppp/configure.in.in.ppp	2005-09-10 04:20:37.000000000 -0400
+++ kdenetwork-3.5.7/kppp/configure.in.in	2007-08-29 09:13:21.000000000 -0400
@@ -26,6 +26,8 @@ AC_TRY_LINK([
   #ifndef STREAMS 
 
     #if defined(linux)
+      #include <linux/if.h>
+      #include <linux/ppp_defs.h>
       #include <linux/if_ppp.h>
     #else
       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */
diff -up kdenetwork-3.5.7/kppp/opener.cpp.ppp kdenetwork-3.5.7/kppp/opener.cpp
--- kdenetwork-3.5.7/kppp/opener.cpp.ppp	2005-09-10 04:20:37.000000000 -0400
+++ kdenetwork-3.5.7/kppp/opener.cpp	2007-08-29 09:14:29.000000000 -0400
@@ -69,6 +69,8 @@ extern "C" int _Precvmsg(int, void*, int
 
 #ifndef HAVE_NET_IF_PPP_H
 #  ifdef HAVE_LINUX_IF_PPP_H
+#    include <linux/if.h>
+#    include <linux/ppp_defs.h>
 #    include <linux/if_ppp.h>
 #  endif
 #else


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdenetwork.spec	29 Aug 2007 11:51:42 -0000	1.101
+++ kdenetwork.spec	17 Sep 2007 23:16:45 -0000	1.102
@@ -19,7 +19,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -39,6 +39,8 @@
 Patch2: kdenetwork-3.1-buildroot.patch
 Patch3: kdenetwork-3.3.92-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
+# include more/proper ppp headers
+Patch5: kdenetwork-3.5.7-ppp.patch
 
 Requires(preun):  chkconfig
 Requires(post):   /sbin/ldconfig chkconfig
@@ -77,6 +79,8 @@
 # sametime
 %{?_enable_sametime_plugin:BuildRequires: meanwhile-devel}
 %{?_with_xmms:BuildRequires: xmms-devel}
+# yahoo
+Requires(hint): jasper
 
 
 %description
@@ -129,6 +133,7 @@
 %patch3 -p1 -b .kppp
 %endif
 %patch4 -p1 -b .resolv
+%patch5 -p1 -b .ppp
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -421,6 +426,12 @@
 
 
 %changelog
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
+- +Requires: jasper (kopete yahoo support)
+
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-4
+- ppp patch (to enable kppp build again)
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-3
 - License: GPLv2
 - Provides: kdenetwork3(-devel)