rpms/kdenetwork/FC-6 kdenetwork-3.5.7-ppp.patch, NONE, 1.1 kdenetwork-3.5.8-kppp.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 kdenetwork.spec, 1.96, 1.97 sources, 1.46, 1.47 kdenetwork-3.3.92-kppp.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdenetwork/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11931

Modified Files:
	.cvsignore kdenetwork.spec sources 
Added Files:
	kdenetwork-3.5.7-ppp.patch kdenetwork-3.5.8-kppp.patch 
Removed Files:
	kdenetwork-3.3.92-kppp.patch 
Log Message:
3.5.8


kdenetwork-3.5.7-ppp.patch:
 configure.in.in |    3 +++
 opener.cpp      |    3 +++
 pppstats.cpp    |    3 +++
 3 files changed, 9 insertions(+)

--- 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 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>
+   #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/opener.cpp.ppp kdenetwork-3.5.7/kppp/opener.cpp
--- 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
+#    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. */

kdenetwork-3.5.8-kppp.patch:
 Kppp.desktop |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE kdenetwork-3.5.8-kppp.patch ---
diff -up kdenetwork-3.5.8/kppp/Kppp.desktop.kppp kdenetwork-3.5.8/kppp/Kppp.desktop
--- kdenetwork-3.5.8/kppp/Kppp.desktop.kppp	2007-10-08 04:49:13.000000000 -0500
+++ kdenetwork-3.5.8/kppp/Kppp.desktop	2007-10-13 16:03:03.000000000 -0500
@@ -66,5 +66,4 @@ Path=
 Type=Application
 Terminal=false
 X-KDE-StartupNotify=true
-X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Network;Dialup;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-6/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	16 Jun 2007 17:39:22 -0000	1.40
+++ .cvsignore	28 Nov 2007 16:36:20 -0000	1.41
@@ -13,3 +13,4 @@
 kdenetwork-3.5.4.tar.bz2
 kdenetwork-3.5.6.tar.bz2
 kdenetwork-3.5.7.tar.bz2
+kdenetwork-3.5.8.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-6/kdenetwork.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdenetwork.spec	16 Jun 2007 17:39:22 -0000	1.96
+++ kdenetwork.spec	28 Nov 2007 16:36:20 -0000	1.97
@@ -12,7 +12,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Name: kdenetwork
-Version: 3.5.7
+Version: 3.5.8
 Release: 1%{?dist}
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
@@ -29,8 +29,9 @@
 
 Patch0: kdenetwork-3.1-desktop.patch
 Patch1: kdenetwork-3.1-buildroot.patch
-Patch3: kdenetwork-3.3.92-kppp.patch
+Patch3: kdenetwork-3.5.8-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
+Patch5: kdenetwork-3.5.7-ppp.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -71,7 +72,8 @@
 %patch0 -p1 -b .dt
 %patch1 -p1 -b .buildroot
 %patch3 -p1 -b .kppp
-%patch4 -p1 -b .ppp
+%patch4 -p1 -b .resolv
+%patch5 -p1 -b .ppp
 
 echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
@@ -216,6 +218,9 @@
 %endif
 
 %changelog
+* Wed Nov 28 2007 Than Ngo <than at redhat.com> 7:3.5.8-1
+- 3.5.8
+
 * Sat Jun 16 2007 Than Ngo <than at redhat.com> - 7:3.5.7-1.fc6
 - 3.5.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-6/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	16 Jun 2007 17:39:22 -0000	1.46
+++ sources	28 Nov 2007 16:36:20 -0000	1.47
@@ -1 +1 @@
-d7f2a05a7e304b33128123c3f67ea636  kdenetwork-3.5.7.tar.bz2
+0e79374d1109d937b0c9bdd3a75e7476  kdenetwork-3.5.8.tar.bz2


--- kdenetwork-3.3.92-kppp.patch DELETED ---