rpms/kdenetwork/F-7 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.99, 1.100 lisarc, 1.1, 1.2 sources, 1.46, 1.47 kdenetwork-3.3.92-kppp.patch, 1.2, NONE

Thu Nov 1 15:47:44 UTC 2007

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16748

Modified Files:
	.cvsignore kdenetwork.spec lisarc 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:
sync w/devel (kde-3.5.8)


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 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:

--- 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/pkgs/rpms/kdenetwork/F-7/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	11 Jun 2007 19:06:26 -0000	1.40
+++ .cvsignore	1 Nov 2007 15:47:10 -0000	1.41
@@ -1 +1,2 @@
 kdenetwork-3.5.7.tar.bz2
+kdenetwork-3.5.8.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-7/kdenetwork.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- kdenetwork.spec	11 Jun 2007 19:13:33 -0000	1.99
+++ kdenetwork.spec	1 Nov 2007 15:47:10 -0000	1.100
@@ -6,7 +6,7 @@
 #define _enable_jingle --enable-jingle
 %define _enable_sametime_plugin --enable-sametime-plugin
 %define _enable_slp --enable-slp
-%define _with_xmms --with_xmms
+%define _with_xmms --with-xmms
 %ifnarch s390 s390x
 %define _with_wifi --with-wifi
 %endif
@@ -16,19 +16,23 @@
 %define final 1
 %define make_cvs 1
 
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
 
 Name:    kdenetwork
 Epoch:   7
-Version: 3.5.7
-Release: 1%{?dist}.1
+Version: 3.5.8
+Release: 6%{?dist}
 Summary: K Desktop Environment - Network Applications
 
-License: GPL
+License: GPLv2
 Group:   Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Provides: kdenetwork3 = %{version}-%{release}
+
 Url: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kppp.pamd
@@ -38,15 +42,22 @@
 
 Patch1: kdenetwork-3.1-desktop.patch
 Patch2: 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
+# include more/proper ppp headers
+Patch5: kdenetwork-3.5.7-ppp.patch
 
-Requires(preun):  chkconfig
-Requires(post):   /sbin/ldconfig chkconfig
+%if 0%{?libs}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+%endif
 
 BuildRequires: gettext
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
 %if %{make_cvs}
 BuildRequires: libtool automake
 %endif
@@ -77,12 +88,19 @@
 Requires(hint): qca-tls
 # sametime
 %{?_enable_sametime_plugin:BuildRequires: meanwhile-devel}
+%{?_with_xmms:BuildRequires: xmms-devel}
+# yahoo
+Requires(hint): jasper
+## lisa
+Requires(preun):  chkconfig
+Requires(post):   chkconfig
+#Requires(hint): samba-client
 
 
 %description
 Networking applications, including:
-* kget: downloader manager.
-* kio_lan: lan browsing kio slave.
+* kget: downloader manager
+* kio_lan: lan browsing kio slave
 * knewsticker: RDF newsticker applet
 * kopete: chat client
 * kppp: dialer and front end for pppd
@@ -91,18 +109,22 @@
 * lisa: lan information server
 
 %package devel
-Summary: Development files for kdenetwork
+Summary: Development files for %{name} 
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel
+Provides: kdenetwork3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kdelibs3-devel
 %description devel
-Development files for kdenetwork. Install kdenetwork-devel if you wish
-to develop or compile KDE networking applications.
+%{summary}. 
 
 %package extras
-Summary: Extras packages from KDEnetwork
+Summary: Extras packages for %{name} 
 Group: Applications/Internet
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%if "%{?_with_xmms:1}" == "1"
+Obsoletes: %{name}-nowlistenting < %{epoch}:%{version}-%{release}
+Provides:  %{name}-nowlistenting = %{epoch}:%{version}-%{release}
+%endif
 %description extras
 More Networking applications for the K Desktop Environment:
  * ksirc
@@ -110,20 +132,22 @@
  * ktalkd
  * kpf
  * kwifimanager
-
-# Should this just go into -extras? -- Rex
 %if "%{?_with_xmms:1}" == "1"
-%package nowlistening
-Summary: Xmms plugin for Kopete
-Group:   Applications/Multimedia
-BuildRequires: xmms-devel
-Requires: %{name} = %{epoch}:%{version}-%{release}
-%description nowlistening
-%{summary}.
-%else
-BuildConflicts: xmms-devel
+ * nowlistening (xmms) plugin for Kopete.
 %endif
 
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description libs
+%{summary}.
+%endif
 
 
 %prep
@@ -136,6 +160,7 @@
 %patch3 -p1 -b .kppp
 %endif
 %patch4 -p1 -b .resolv
+%patch5 -p1 -b .ppp
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -190,7 +215,7 @@
 done
 fi
 
-# Show only in KDE
+# Show only in KDE, FIXME, need to re-evaluate these -- Rex
 for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
    kwifimanager kget knewsticker ksirc kdict ; do
    if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
@@ -221,7 +246,7 @@
 
 
 %post
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 /sbin/chkconfig --add lisa ||:
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
@@ -230,7 +255,7 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -243,6 +268,12 @@
   /sbin/service lisa stop > /dev/null 2>&1 ||:
 fi
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
 %post extras
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
@@ -264,7 +295,7 @@
 %defattr(-,root,root,-)
 
 # ksirc
-%doc %{_docdir}/HTML/??/ksirc/
+%{_docdir}/HTML/??/ksirc/
 %{_bindir}/ksirc
 %{_libdir}/libkdeinit_ksirc.*
 %{_libdir}/kde3/ksirc.*
@@ -274,7 +305,7 @@
 %{_datadir}/icons/hicolor/*/apps/ksirc.*
 
 # kdict
-%doc %{_docdir}/HTML/en/kdict
+%{_docdir}/HTML/en/kdict
 %{_bindir}/kdict
 %{_libdir}/kde3/kdict*
 %{_libdir}/libkdeinit_kdict.*
@@ -284,7 +315,7 @@
 %{_datadir}/icons/hicolor/*/apps/kdict.*
 
 # ktalk
-%doc %{_docdir}/HTML/en/ktalkd
+%{_docdir}/HTML/en/ktalkd
 %{_bindir}/ktalkd*
 %{_libdir}/kde3/kcm_ktalkd.*
 %{_datadir}/applications/kde/kcmktalkd.desktop
@@ -294,7 +325,7 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 
 # kpf
-%doc %{_docdir}/HTML/en/kpf
+%{_docdir}/HTML/en/kpf
 %{_libdir}/kde3/kpf*
 %{_datadir}/apps/kicker/applets/kpfapplet.desktop
 %{_datadir}/icons/crystalsvg/*/apps/kpf.*
@@ -311,8 +342,18 @@
 %{_datadir}/icons/hicolor/*/apps/kwifimanager.png
 %endif
 
+%if "%{?_with_xmms:1}" == "1"
+#files nowlistening
+#defattr(-,root,root,-)
+%{_datadir}/apps/kopete/*nowlisteningchatui*
+%{_datadir}/apps/kopete/*nowlisteningui*
+%{_datadir}/services/kconfiguredialog/*nowlistening*
+%{_datadir}/services/*nowlistening*
+%{_libdir}/kde3/*nowlistening*
+%endif
+
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 
 # ksirc
@@ -377,7 +418,7 @@
 %exclude %{_libdir}/kde3/*nowlistening*
 %endif
 
-%doc %{_docdir}/HTML/en/*
+%{_docdir}/HTML/en/*
 %if %console_helper
 %config(noreplace) /etc/security/console.apps/kppp
 %config(noreplace) /etc/pam.d/kppp
@@ -387,19 +428,17 @@
 %endif
 %config(noreplace) %{_sysconfdir}/lisarc
 %config(noreplace) %{_initrddir}/lisa
-%{_libdir}/*.so.*
 %{_libdir}/libkdeinit_*.so
 %if "%{?_with_wifi:1}" == "1"
-%{_libdir}/libkwireless.so
+%{_libdir}/libkwireless.*
 %endif
-%{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
 %{_bindir}/*
 %{_datadir}/apps/*
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/.hidden/*
-%config(noreplace) %{_datadir}/config/*
+%{_datadir}/config/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/*
@@ -407,31 +446,68 @@
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
 
-%files devel
-%defattr(-,root,root)
-%{_includedir}/kde/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%if "%{?_with_wifi:1}" == "1"
-%exclude %{_libdir}/libkwireless.so
-%endif
-
-%if "%{?_with_xmms:1}" == "1"
-%files nowlistening
+%if 0%{?libs}
+%files libs
 %defattr(-,root,root,-)
-%{_datadir}/apps/kopete/*nowlisteningchatui*
-%{_datadir}/apps/kopete/*nowlisteningui*
-%{_datadir}/services/kconfiguredialog/*nowlistening*
-%{_datadir}/services/*nowlistening*
-%{_libdir}/kde3/*nowlistening*
 %endif
+%{_libdir}/libkopete*.so.*
+%{_libdir}/libkopete*.la
+%{_libdir}/librss.so.*
+%{_libdir}/librss.la
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/kde/*
+%{_libdir}/libkopete*.so
+%{_libdir}/librss.so
 
 
 %changelog
+* Thu Nov 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-6
+- drop: Req: samba-client (#361511)
+- lisarc: SearchUsingNmblookup = 0 (#361511)
+
+* Thu Nov 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-5
+- Requires: samba-client (#361511)
+
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-4
+- libs: Requires: %%{name}... (multilib upgrades)
+- fixup scriptlets
+
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-3
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+
+* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-2
+- -libs: %%post/%%postun -p /sbin/ldconfig
+- -libs conditional (f8+)
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-1
+- kde-3.5.8
+- libs subpkg (more multilib friendly)
+
+* 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)
+
+* 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)
+- move -nowlistening subpkg bits into -extras
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 7:3.5.7-2
+- Rebuild for selinux ppc32 issue.
+
 * Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-1
 - 3.5.7
 
+* Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 7:3.5.6-6
+- Rebuild against newer libiw.so
+
 * Wed May 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.6-5
 - revert back to console_helper=1 (pending more discussion)
 
@@ -837,115 +913,3 @@
 
 * Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-1
 - 3.0 final
-
-* Wed Mar  6 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020306.1
-- Rename subpackages
-
-* Thu Jan 31 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020129.2
-- Rebuild with new kdelibs
-
-* Tue Jan 29 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020129.1
-- Update
-
-* Tue Jan  8 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020108.1
-- Update
-- Integrate ktalk stuff with xinetd
-
-* Tue Dec 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20011218.1
-- Update
-- Split into subpackages
-
-* Sun Jul 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010722.1
-- Update
-- Add build dependencies
-- Work around ia64 breakages
-
-* Sun May 13 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010513.1
-- Update to CVS
-- clean up specfile
-- Use %%post -p and %%postun -p
-
-* Wed Feb 21 2001 Than Ngo <than at redhat.com>
-- 2.1-respin
-
-* Mon Feb 19 2001 Than Ngo <than at redhat.com>
-- update 2.1
-- fix dangling symlinks
-
-* Fri Feb  2 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Limit CPU usage to 2 CPUs to make asok happy
-
-* Mon Jan 22 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-- Don't require perl, not everyone using ksirc is also using
-  ksirc perl scripting...
-
-* Mon Jan  8 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update (needed because of kdelibs change)
-- Obsolete kdenetwork2 (from 7.0 preview)
-
-* Mon Jan  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-
-* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add missing PAM file, fix group
-
-* Wed Nov 15 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- update to HEAD
-
-* Fri Nov  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update CVS (fix kmail segfault with empty identity)
-
-* Tue Oct 31 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix up consolehelper config
-
-* Mon Oct 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update to current KDE_2_0_BRANCH (this should fix up knode)
-- Run kppp through consolehelper (Bug #20021)
-- Split of kppp and kppplog to a separate package, kdenetwork-ppp
-  (RFE #20022)
-
-* Mon Oct 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.0 final
-
-* Wed Oct  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.0
-
-* Thu Aug 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 1.93
-
-* Mon Aug  7 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new version
-
-* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- disable keystone for now (compiler problem)
-
-* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- some fixes to spec file
-
-* Tue Jul 18 2000 Than Ngo <than at redhat.de>
-- rebuilt with glibc-2.1.92-14 and gcc-2.96-40
-
-* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Obsolete ktalk (powertools 6.x)
-- SMPify
-
-* Tue Jul 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- use gcc 2.96
-- new snapshot
-
-* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Epoch
-
-* Tue Jun 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- ExcludeArch ia64 for now
-
-* Sat Mar 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- move it to /usr, where it belongs
-
-* Mon Oct 25 1999 Bernhard Rosenkraenzer <bero at redhat.de>
-- initial RPM


Index: lisarc
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-7/lisarc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lisarc	9 Sep 2004 06:53:37 -0000	1.1
+++ lisarc	1 Nov 2007 15:47:10 -0000	1.2
@@ -2,7 +2,7 @@
 PingNames = 
 AllowedAddresses = 127.0.0.1/255.255.255.0;
 BroadcastNetwork = 127.0.0.1/255.255.255.0;
-SearchUsingNmblookup = 1
+SearchUsingNmblookup = 0
 FirstWait = 30
 SecondWait = -1
 UpdatePeriod = 150


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-7/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	11 Jun 2007 19:06:26 -0000	1.46
+++ sources	1 Nov 2007 15:47:10 -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 ---


