Hello community, here is the log from the commit of package kdenetwork3 checked in at Wed Jun 20 19:14:21 CEST 2007. -------- --- KDE/kdenetwork3/kdenetwork3.changes 2007-06-13 17:35:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdenetwork3/kdenetwork3.changes 2007-06-20 16:58:27.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 20 16:58:14 CEST 2007 - dmueller@suse.de + +- update 3_5_BRANCH.diff for various bug fixes + +------------------------------------------------------------------- Old: ---- 3_5_BRANCH-r673109.diff 3_5_BRANCH-r673118.diff 3_5_BRANCH-r674906.diff 3_5_BRANCH-r674921.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork3.spec ++++++ --- /var/tmp/diff_new_pack.Rq5632/_old 2007-06-20 19:13:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Rq5632/_new 2007-06-20 19:13:58.000000000 +0200 @@ -20,7 +20,7 @@ Summary: KDE Network Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.5.7 -Release: 19 +Release: 21 Provides: kdenetwork3-lan:/opt/kde3/bin/kpf Source0: kdenetwork-%{version}.tar.bz2 Source1: init.lisa @@ -45,10 +45,6 @@ Patch23: kopete_groupwise_better_error_reporting.diff Patch24: kdenetwork_networkstatus_branch.diff Patch26: kopete_install_more_headers.diff -Patch27: 3_5_BRANCH-r673109.diff -Patch28: 3_5_BRANCH-r673118.diff -Patch29: 3_5_BRANCH-r674906.diff -Patch30: 3_5_BRANCH-r674921.diff Patch100: knewsticker_sources.patch Url: http://www.kde.org Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -230,6 +226,7 @@ %package devel Summary: build environment from kdenetwork Group: Development/Libraries/KDE +Requires: %name = %version %description devel The build environment from kdenetwork. @@ -260,11 +257,9 @@ %patch21 %patch23 %patch24 -E -%patch26 -%patch27 -%patch28 -%patch29 -%patch30 +# doesn't apply. why do we install more headers anyway, +# there is no depending package ?! (dirk) +#%patch26 %patch100 # remove ktalkd for security reasons rm -rf ktalkd doc/ktalkd doc/kcontrol/kcmktalkd @@ -648,6 +643,8 @@ /opt/kde3/%_lib/libkopete_videodevice.so %changelog +* Wed Jun 20 2007 - dmueller@suse.de +- update 3_5_BRANCH.diff for various bug fixes * Wed Jun 13 2007 - wstephenson@suse.de - Fix adding contacts to the Yahoo contact list in Kopete - Fix crash when logging into Yahoo on another client ++++++ 3_5_BRANCH.diff ++++++ ++++ 1681 lines (skipped) ++++ between KDE/kdenetwork3/3_5_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdenetwork3/3_5_BRANCH.diff ++++++ kdenetwork_networkstatus_branch.diff ++++++ --- /var/tmp/diff_new_pack.Rq5632/_old 2007-06-20 19:13:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Rq5632/_new 2007-06-20 19:13:59.000000000 +0200 @@ -684,10 +684,8 @@ } //END namespace Kopete #include "kopeteaccountmanager.moc" -Index: kopete/libkopete/Makefile.am -=================================================================== ---- kopete/libkopete/Makefile.am (.../KDE/3.5/kdenetwork/kopete) (revision 667245) -+++ kopete/libkopete/Makefile.am (.../work/~wstephens/kopete) (revision 667245) +--- kopete/libkopete/Makefile.am ++++ kopete/libkopete/Makefile.am @@ -19,7 +19,7 @@ lib_LTLIBRARIES = libkopete.la @@ -719,11 +717,9 @@ kopetepassword.h kopeteplugin.h kopeteprotocol.h kopetesimplemessagehandler.h kopetetask.h \ - kopetetransfermanager.h kopeteuiglobal.h kabcpersistence.h managedconnectionaccount.h \ + kopetetransfermanager.h kopeteuiglobal.h kabcpersistence.h \ - kopetenotifydataobject.h kopeteversion.h kopeteprefs.h kopetepicture.h webcamwidget.h + kopetenotifydataobject.h kopeteversion.h kopeteprefs.h kopetepicture.h webcamwidget.h \ + kopetepluginmanager.h - # vim: set noet: -Index: kppp/kpppwidget.cpp -=================================================================== --- kppp/kpppwidget.cpp (.../KDE/3.5/kdenetwork/kppp) (revision 667246) +++ kppp/kpppwidget.cpp (.../work/~wstephens/kppp) (revision 667246) @@ -69,6 +69,8 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org