Author: walluck
Date: Wed Jan 31 14:01:27 2007
New Revision: 115690
Added:
packages/cooker/ksensors/current/SOURCES/ksensors-0.7.3-cpupanel-unknow-spelling.patch
packages/cooker/ksensors/current/SOURCES/ksensors-0.7.3-sensors-no-min-max.patch
Modified:
packages/cooker/ksensors/current/SPECS/ksensors.spec
Log:
add spelling fix and k8temp fix (from Debian)
Added:
packages/cooker/ksensors/current/SOURCES/ksensors-0.7.3-cpupanel-unknow-spelling.patch
==============================================================================
--- (empty file)
+++
packages/cooker/ksensors/current/SOURCES/ksensors-0.7.3-cpupanel-unknow-spelling.patch
Wed Jan 31 14:01:27 2007
@@ -0,0 +1,16 @@
+--- ksensors-0.7.3.orig/src/cpupanel.cpp
++++ ksensors-0.7.3/src/cpupanel.cpp
+@@ -60,11 +60,11 @@
+
+ CpuPanel::CpuPanel(QWidget *parent, const char *name) : Panel(parent,name)
+ {
+- sCpu= "Unknow";
++ sCpu= "Unknown";
+ getCpuInfoValue("model name",sCpu);
+ adjustString(sCpu,16);
+
+- sVendor= "Unknow";
++ sVendor= "Unknown";
+ getCpuInfoValue("vendor_id",sVendor);
+ adjustString(sVendor,16);
+
Added:
packages/cooker/ksensors/current/SOURCES/ksensors-0.7.3-sensors-no-min-max.patch
==============================================================================
--- (empty file)
+++
packages/cooker/ksensors/current/SOURCES/ksensors-0.7.3-sensors-no-min-max.patch
Wed Jan 31 14:01:27 2007
@@ -0,0 +1,123 @@
+--- ksensors-0.7.3.orig/src/lmsensor.cpp
++++ ksensors-0.7.3/src/lmsensor.cpp
+@@ -33,22 +33,47 @@
+
+ bool LMSensor::init(const sensors_feature_data **data, int *nr1,int *nr2)
+ {
+-double min,max;
+-
++ double min,max;
+ const sensors_chip_name *chip_name= getChipName();
++ const char* main_name = (*data)->name;
++ feature= (*data)->number;
++ char *label;
++ QString str;
++
++ bool min_max=false;
++ while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) &&
(*data)->mapping!=SENSORS_NO_MAPPING) {
++ str= (*data)->name;
++ if(str.find("_min")>=0 || str.find("_low")>=0) {
++ sensors_get_feature(*chip_name, (*data)->number, &valMin);
++ min_max=true;
++ }
++ else if(str.find("_max")>=0 || str.find("_over")>=0 ||
str.find("_high")>=0) {
++ sensors_get_feature(*chip_name, (*data)->number, &valMax);
++ min_max=true;
++ }
++ }
++
++ double newVal;
++ if ((sensors_get_ignored(*chip_name, feature) != 1) ||
(sensors_get_feature(*chip_name, feature, &newVal) != 0)) {
++ return false;
++ }
+
+- if (strstr((*data)->name, "temp"))
++ if (strstr(main_name, "temp"))
+ {
+ setType(lmTemp);
+ max= 65;
+ min= 0;
+ }
+- else if (strstr((*data)->name, "fan"))
++ else if (strstr(main_name, "fan"))
+ {
+ setType(lmFan);
+ max= 10000;
+ min= 3000;
+ }
++ else if (strstr(main_name, "alarm") || strstr(main_name, "sensor") ||
strstr(main_name, "vrm"))
++ {
++ return false;
++ }
+ else
+ {
+ setType(lmVoltage);
+@@ -56,47 +81,33 @@
+ min= -16;
+ }
+
+- feature= (*data)->number;
+-
+- QString str;
+- str.sprintf("%s.%s", chip_name->prefix, (*data)->name );
++ str.sprintf("%s.%s", chip_name->prefix, main_name);
+ setName( str.latin1() );
+
+- char *label;
+ sensors_get_label(*chip_name,feature,&label);
+ setDescription(QString(label));
+
+- bool valid= false;
+- while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) &&
(*data)->mapping!=SENSORS_NO_MAPPING) {
+- str= (*data)->name;
+- if(str.find("_min")>=0 || str.find("_low")>=0) {
+- sensors_get_feature(*chip_name, (*data)->number, &valMin);
+- valid= true;
+- } else
+- if(str.find("_max")>=0 || str.find("_over")>=0 ||
str.find("_high")>=0) {
+- sensors_get_feature(*chip_name, (*data)->number, &valMax);
+- valid= true;
+- }
+- }
+-
+- if(valid) {
+- double newVal;
+- valid= (sensors_get_feature(*chip_name, feature, &newVal)==0);
+- if(valid) {
+- if(min>max) {
+- double pivot= valMin;
+- min= max;
+- max= pivot;
+- }
+- setValueMax(max,dgCelsius);
+- setValueMin(min,dgCelsius);
+- setValue((max+min)/2,dgCelsius);
+- readConfig();
+- updateValue();
+- setValueIdeal(getValue());
+- }
++ if(min_max){
++ if(min>max) {
++ double pivot= valMin;
++ min= max;
++ max= pivot;
++ }
++ setValueMax(max,dgCelsius);
++ setValueMin(min,dgCelsius);
++ setValue((max+min)/2,dgCelsius);
+ }
+- return valid;
++ else {
++ setValueMax(70,dgCelsius);
++ setValueMin(0,dgCelsius);
++ setValue(newVal,dgCelsius);
++ }
++
++ readConfig();
++ updateValue();
++ setValueIdeal(getValue());
++
++ return true;
+ }
+
+ void LMSensor::updateValue()
Modified: packages/cooker/ksensors/current/SPECS/ksensors.spec
==============================================================================
--- packages/cooker/ksensors/current/SPECS/ksensors.spec (original)
+++ packages/cooker/ksensors/current/SPECS/ksensors.spec Wed Jan 31
14:01:27 2007
@@ -1,10 +1,6 @@
-%define name ksensors
-%define version 0.7.3
-%define release %mkrel 7
-
-Name: %{name}
-Version: %{version}
-Release: %{release}
+Name: ksensors
+Version: 0.7.3
+Release: %mkrel 8
Group: Graphical desktop/KDE
License: GPL
Source0:
http://ovh.dl.sourceforge.net/sourceforge/ksensors/%{name}-%{version}.tar.bz2
@@ -16,6 +12,8 @@
Patch4: ksensors-0.7.3-put-qradiobuttons-in-qbuttongroup.patch
Patch5: ksensors-0.7.3-check-for-hddtemp-without-warnings.patch
Patch6: ksensors-0.7.3-add-nb-translation.patch
+Patch7: ksensors-0.7.3-cpupanel-unknow-spelling.patch
+Patch8: ksensors-0.7.3-sensors-no-min-max.patch
URL: http://ksensors.sourceforge.net/
BuildRequires: qt3-devel libz-devel X11-devel lm_sensors-devel kdelibs-devel
BuildRequires: png-devel jpeg-devel libart_lgpl-devel
@@ -40,6 +38,8 @@
%patch4 -p1 -b .qradiobuttons
%patch5 -p1 -b .no_hddtemp_warnings
%patch6 -p1 -b .nb_translation
+%patch7 -p1 -b .cpupanel_unknow_spelling
+%patch8 -p1 -b .sensors_no_min_max
%build
# Search for qt/kde libraries in the right directories (avoid patch)
