rpms/kdenetwork/devel kdenetwork-3.5.7-ppp.patch, 1.1, 1.2 kdenetwork.spec, 1.102, 1.103

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdenetwork-3.5.7-ppp.patch kdenetwork.spec 
Log Message:
* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-6
- fix ppp patch


kdenetwork-3.5.7-ppp.patch:

Index: kdenetwork-3.5.7-ppp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork-3.5.7-ppp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdenetwork-3.5.7-ppp.patch	17 Sep 2007 23:16:45 -0000	1.1
+++ kdenetwork-3.5.7-ppp.patch	18 Sep 2007 19:08:01 -0000	1.2
@@ -1,35 +1,39 @@
 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 @@
+--- kdenetwork-3.5.7/kppp/pppstats.cpp.ppp	2006-03-17 04:12:34.000000000 -0600
++++ kdenetwork-3.5.7/kppp/pppstats.cpp	2007-09-18 13:49:36.000000000 -0500
+@@ -69,6 +69,9 @@
   #ifndef HAVE_NET_IF_PPP_H
    #ifdef HAVE_LINUX_IF_PPP_H
     #include <linux/if.h>
-+   #include <linux/ppp_defs.h>
++   #ifndef aligned_u64
++    #define aligned_u64 unsigned long long __attribute__((aligned(8)))
++   #endif
     #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
+--- kdenetwork-3.5.7/kppp/opener.cpp.ppp	2005-09-10 03:20:37.000000000 -0500
++++ kdenetwork-3.5.7/kppp/opener.cpp	2007-09-18 13:46:39.000000000 -0500
+@@ -69,6 +69,9 @@ 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>
++#    ifndef aligned_u64
++#      define aligned_u64 unsigned long long __attribute__((aligned(8)))
++#    endif
  #    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 03:20:37.000000000 -0500
++++ kdenetwork-3.5.7/kppp/configure.in.in	2007-09-18 13:46:39.000000000 -0500
+@@ -26,6 +26,9 @@ AC_TRY_LINK([
+   #ifndef STREAMS 
+ 
+     #if defined(linux)
++      #ifndef aligned_u64
++        #define aligned_u64 unsigned long long __attribute__((aligned(8)))
++      #endif
+       #include <linux/if_ppp.h>
+     #else
+       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdenetwork.spec	17 Sep 2007 23:16:45 -0000	1.102
+++ kdenetwork.spec	18 Sep 2007 19:08:01 -0000	1.103
@@ -19,7 +19,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -426,6 +426,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-6
+- fix ppp patch
+
 * Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
 - +Requires: jasper (kopete yahoo support)