Hello community,
here is the log from the commit of package kde3-knemo for openSUSE:Factory
checked in at 2012-05-03 10:57:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde3-knemo (Old)
and /work/SRC/openSUSE:Factory/.kde3-knemo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde3-knemo", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde3-knemo/kde3-knemo.changes 2011-09-23
02:05:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kde3-knemo.new/kde3-knemo.changes
2012-05-03 10:57:40.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 24 13:30:00 UTC 2012 - an...@opensuse.org
+
+- use sys backend by default instead of nettools
+
+-------------------------------------------------------------------
New:
----
knemod.sys-def.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde3-knemo.spec ++++++
--- /var/tmp/diff_new_pack.23xI1k/_old 2012-05-03 10:57:41.000000000 +0200
+++ /var/tmp/diff_new_pack.23xI1k/_new 2012-05-03 10:57:41.000000000 +0200
@@ -12,9 +12,6 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
-
-# norootforbuild
%define _prefix /opt/kde3
@@ -30,6 +27,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: 12956-knemo-%{version}.tar.bz2
+Patch0: knemod.sys-def.diff
BuildRequires: bzip2 kdelibs3-devel wireless-tools libjpeg-devel
update-desktop-files
@@ -40,13 +38,9 @@
KNemo offers a network monitor similar to the one found in Windows. For every
network interface
it displays an icon in the systray.
-
-Authors:
---------
- Percy Leonhardt
-
%prep
%setup -q -n knemo-%{version}
+%patch0 -p1
%build
. /etc/opt/kde3/common_options
@@ -54,7 +48,6 @@
make %{?jobs:-j%jobs}
-
%install
%makeinstall
@@ -71,10 +64,6 @@
%find_lang kcm_knemo knemo.lang
%find_lang knemod knemo.lang
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f knemo.lang
%defattr(-,root,root)
%{_libdir}/kde3/kcm_knemo.la
++++++ knemod.sys-def.diff ++++++
diff -uNr knemo.orig/src/kcm/configdialog.cpp knemo/src/kcm/configdialog.cpp
--- knemo.orig/src/kcm/configdialog.cpp 2012-04-14 02:14:14.000000000 -0500
+++ knemo/src/kcm/configdialog.cpp 2012-04-17 23:38:44.627171353 -0500
@@ -69,11 +69,11 @@
: KCModule( KNemoFactory::instance(), parent, name ),
mLock( false ),
mDlg( new ConfigDlg( this ) ),
- mColorVLines( 0x04FB1D ),
- mColorHLines( 0x04FB1D ),
- mColorIncoming( 0x1889FF ),
+ mColorVLines( 0x101726 ),
+ mColorHLines( 0x30394C ),
+ mColorIncoming( 0x556FFF ),
mColorOutgoing( 0xFF7F08 ),
- mColorBackground( 0x313031 )
+ mColorBackground( 0x090D14 )
{
KGlobal::locale()->insertCatalogue("kcm_knemo");
setupToolTipArray();
@@ -268,8 +268,9 @@
mToolTipContent = config->readNumEntry( "ToolTipContent", 2 );
// select the backend from the config file
+ // set default backend to Sys (kernels >= 2.6)
bool foundBackend = false;
- QString backend = config->readEntry( "Backend", "Nettools" );
+ QString backend = config->readEntry( "Backend", "Sys" );
int i;
for ( i = 0; KCMRegistry[i].name != QString::null; i++ )
{
@@ -282,7 +283,8 @@
if ( !foundBackend )
{
- i = 0; // use the first backend (Nettools)
+ i = 1; // use the second backend ('Sys' as default kernel >=2.6 )
+
}
mDlg->comboBoxBackends->setCurrentItem( i );
mDlg->textLabelBackendDescription->setText( KCMRegistry[i].description );
@@ -494,8 +496,8 @@
mDlg->numInputPollInterval->setValue( 1 );
mDlg->numInputSaveInterval->setValue( 60 );
mDlg->lineEditStatisticsDir->setText( KGlobal::dirs()->saveLocation(
"data", "knemo/" ) );
- mDlg->comboBoxBackends->setCurrentItem( 0 );
- mDlg->textLabelBackendDescription->setText( KCMRegistry[0].description );
+ mDlg->comboBoxBackends->setCurrentItem( 1 );
+ mDlg->textLabelBackendDescription->setText( KCMRegistry[1].description );
// Default tool tips
mToolTipContent = 2;
diff -uNr knemo.orig/src/knemod/knemodaemon.cpp knemo/src/knemod/knemodaemon.cpp
--- knemo.orig/src/knemod/knemodaemon.cpp 2012-02-08 18:04:27.000000000
-0600
+++ knemo/src/knemod/knemodaemon.cpp 2012-04-18 00:01:59.532147406 -0500
@@ -44,11 +44,11 @@
KNemoDaemon::KNemoDaemon( const QCString& name )
: KDEDModule( name ),
- mColorVLines( 0x04FB1D ),
- mColorHLines( 0x04FB1D ),
- mColorIncoming( 0x1889FF ),
+ mColorVLines( 0x101726 ),
+ mColorHLines( 0x30394C ),
+ mColorIncoming( 0x556FFF ),
mColorOutgoing( 0xFF7F08 ),
- mColorBackground( 0x313031 ),
+ mColorBackground( 0x090D14 ),
mInstance( new KInstance( "knemo" ) ),
mNotifyInstance( new KNotifyClient::Instance( mInstance ) )
{
@@ -58,7 +58,7 @@
// select the backend from the config file
KConfig* config = new KConfig( "knemorc", true );
config->setGroup( "General" );
- mBackendName = config->readEntry( "Backend", "Nettools" );
+ mBackendName = config->readEntry( "Backend", "Sys" );
delete config;
bool foundBackend = false;
@@ -74,7 +74,7 @@
if ( !foundBackend )
{
- i = 0; // use the first backend (Nettools)
+ i = 1; // use the second backend ('Sys' as default kernel >=2.6 )
}
mBackend = ( *DaemonRegistry[i].function )( mInterfaceDict );
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
