François Andriot
11 years ago
parent
a39456d7ca
commit
86cd0dafaf
@ -1,14 +0,0 @@
|
|||||||
--- ksensors-0.7.3/src/lmsensor.cpp.ORI 2011-12-22 06:57:39.285341486 -0500
|
|
||||||
+++ ksensors-0.7.3/src/lmsensor.cpp 2011-12-22 06:58:33.596092430 -0500
|
|
||||||
@@ -43,7 +43,11 @@
|
|
||||||
char *label = NULL;
|
|
||||||
QString uniqueSensorName;
|
|
||||||
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
+ uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus, chip_name->addr, main_name);
|
|
||||||
+#else
|
|
||||||
uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus.nr, chip_name->addr, main_name);
|
|
||||||
+#endif
|
|
||||||
setName(uniqueSensorName.latin1());
|
|
||||||
|
|
||||||
#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
@ -1,79 +0,0 @@
|
|||||||
diff -up ksensors-0.7.3/src/lmsensor.cpp.minmax ksensors-0.7.3/src/lmsensor.cpp
|
|
||||||
--- ksensors-0.7.3/src/lmsensor.cpp.minmax 2007-11-11 15:12:24.000000000 +0100
|
|
||||||
+++ ksensors-0.7.3/src/lmsensor.cpp 2007-11-11 15:26:30.000000000 +0100
|
|
||||||
@@ -40,17 +40,30 @@ bool LMSensor::init(const sensors_featur
|
|
||||||
char *label;
|
|
||||||
QString str;
|
|
||||||
|
|
||||||
- bool min_max=false;
|
|
||||||
+ bool min_found=false;
|
|
||||||
+ bool max_found=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;
|
|
||||||
+ int len = strlen((*data)->name);
|
|
||||||
+ const char *postfix = (*data)->name + len - 4;
|
|
||||||
+
|
|
||||||
+ if (len < 5)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ if((!strcmp(postfix, "_min") || !strcmp(postfix, "_low")) &&
|
|
||||||
+ !sensors_get_feature(*chip_name, (*data)->number, &valMin))
|
|
||||||
+ min_found=true;
|
|
||||||
+
|
|
||||||
+ if(!strcmp(postfix, "_max") &&
|
|
||||||
+ !sensors_get_feature(*chip_name, (*data)->number, &valMax)) {
|
|
||||||
+ max_found=true;
|
|
||||||
+ continue;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ postfix--;
|
|
||||||
+
|
|
||||||
+ if((!strcmp(postfix, "_over") || !strcmp(postfix, "_high")) &&
|
|
||||||
+ !sensors_get_feature(*chip_name, (*data)->number, &valMax))
|
|
||||||
+ max_found=true;
|
|
||||||
}
|
|
||||||
|
|
||||||
double newVal;
|
|
||||||
@@ -87,22 +100,21 @@ bool LMSensor::init(const sensors_featur
|
|
||||||
sensors_get_label(*chip_name,feature,&label);
|
|
||||||
setDescription(QString(label));
|
|
||||||
|
|
||||||
- if(min_max){
|
|
||||||
- if(min>max) {
|
|
||||||
- double pivot= valMin;
|
|
||||||
- min= max;
|
|
||||||
- max= pivot;
|
|
||||||
- }
|
|
||||||
- setValueMax(max,dgCelsius);
|
|
||||||
- setValueMin(min,dgCelsius);
|
|
||||||
- setValue((max+min)/2,dgCelsius);
|
|
||||||
- }
|
|
||||||
- else {
|
|
||||||
- setValueMax(70,dgCelsius);
|
|
||||||
- setValueMin(0,dgCelsius);
|
|
||||||
- setValue(newVal,dgCelsius);
|
|
||||||
+ if(min_found)
|
|
||||||
+ min = valMin;
|
|
||||||
+
|
|
||||||
+ if(max_found)
|
|
||||||
+ max = valMax;
|
|
||||||
+
|
|
||||||
+ if(min>max) {
|
|
||||||
+ double pivot= min;
|
|
||||||
+ min= max;
|
|
||||||
+ max= pivot;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ setValueMax(max,dgCelsius);
|
|
||||||
+ setValueMin(min,dgCelsius);
|
|
||||||
+
|
|
||||||
readConfig();
|
|
||||||
updateValue();
|
|
||||||
setValueIdeal(getValue());
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
--- ksensors-0.7.3/admin/cvs.sh.autotools 2013-06-04 21:59:18.325691011 +0200
|
|
||||||
+++ ksensors-0.7.3/admin/cvs.sh 2013-06-04 21:58:49.715264098 +0200
|
|
||||||
@@ -64,7 +64,7 @@
|
|
||||||
echo "*** KDE requires automake 1.6.1 or newer"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
- automake*1.6.* | automake*1.7* ) : ;;
|
|
||||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* ) : ;;
|
|
||||||
"" )
|
|
||||||
echo "*** AUTOMAKE NOT FOUND!."
|
|
||||||
echo "*** KDE requires automake 1.6.1 or newer"
|
|
||||||
@@ -123,7 +123,7 @@
|
|
||||||
echo "*** Creating configure"
|
|
||||||
call_and_fix_autoconf
|
|
||||||
|
|
||||||
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
|
||||||
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
|
||||||
echo "*** Creating config.h template"
|
|
||||||
$AUTOHEADER || exit 1
|
|
||||||
fi
|
|
||||||
--- ksensors-0.7.3/admin/configure.in.min.ORI 2013-06-04 21:59:24.783561656 +0200
|
|
||||||
+++ ksensors-0.7.3/admin/configure.in.min 2013-06-04 21:59:33.526386508 +0200
|
|
||||||
@@ -41,7 +41,7 @@
|
|
||||||
KDE_SET_PREFIX
|
|
||||||
|
|
||||||
dnl generate the config header
|
|
||||||
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
|
||||||
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
|
|
||||||
|
|
||||||
dnl Checks for programs.
|
|
||||||
AC_CHECK_COMPILERS
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- ksensors-0.7.3/src/sounds/Makefile.am.ORI 2012-10-07 11:24:46.315092603 +0200
|
|
||||||
+++ ksensors-0.7.3/src/sounds/Makefile.am 2012-10-07 11:25:08.288633760 +0200
|
|
||||||
@@ -5,6 +5,7 @@
|
|
||||||
EXTRA_DIST = ksensors_alert.wav
|
|
||||||
|
|
||||||
install-data-local:
|
|
||||||
+ $(mkinstalldirs) $(kde_sounddir)
|
|
||||||
$(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav
|
|
||||||
uninstall-local:
|
|
||||||
rm -f $(kde_sounddir)/ksensors_alert.wav
|
|
||||||
@ -1,245 +0,0 @@
|
|||||||
diff -up ksensors-0.7.3/src/lmsensor.cpp.lm_sensors3x ksensors-0.7.3/src/lmsensor.cpp
|
|
||||||
--- ksensors-0.7.3/src/lmsensor.cpp.lm_sensors3x 2007-11-11 16:34:15.000000000 +0100
|
|
||||||
+++ ksensors-0.7.3/src/lmsensor.cpp 2007-11-11 16:37:58.000000000 +0100
|
|
||||||
@@ -30,8 +30,11 @@ LMSensor::LMSensor(SensorsList *parent):
|
|
||||||
LMSensor::~LMSensor(){
|
|
||||||
}
|
|
||||||
|
|
||||||
-
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
bool LMSensor::init(const sensors_feature_data **data, int *nr1,int *nr2)
|
|
||||||
+#else
|
|
||||||
+bool LMSensor::init(const sensors_feature **data, int *nr1, int *nr2)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
double min,max;
|
|
||||||
const sensors_chip_name *chip_name= getChipName();
|
|
||||||
@@ -40,6 +43,7 @@ bool LMSensor::init(const sensors_featur
|
|
||||||
char *label;
|
|
||||||
QString str;
|
|
||||||
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
bool min_found=false;
|
|
||||||
bool max_found=false;
|
|
||||||
while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) && (*data)->mapping!=SENSORS_NO_MAPPING) {
|
|
||||||
@@ -105,7 +109,97 @@ bool LMSensor::init(const sensors_featur
|
|
||||||
|
|
||||||
if(max_found)
|
|
||||||
max = valMax;
|
|
||||||
-
|
|
||||||
+
|
|
||||||
+#else /* libsensors4 code */
|
|
||||||
+
|
|
||||||
+ const sensors_subfeature *sub_feature;
|
|
||||||
+ const sensors_feature *feature_data = *data;
|
|
||||||
+
|
|
||||||
+ /* Move to next feature for the loop in LMSensorsChip::createSensors() */
|
|
||||||
+ *data = sensors_get_features(chip_name, nr1);
|
|
||||||
+
|
|
||||||
+ switch(feature_data->type)
|
|
||||||
+ {
|
|
||||||
+ case SENSORS_FEATURE_IN:
|
|
||||||
+ sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_IN_INPUT);
|
|
||||||
+
|
|
||||||
+ if (!sub_feature)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ feature = sub_feature->number;
|
|
||||||
+
|
|
||||||
+ if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_IN_MIN)) ||
|
|
||||||
+ sensors_get_value(chip_name, sub_feature->number, &min))
|
|
||||||
+ min = -16;
|
|
||||||
+
|
|
||||||
+ if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_IN_MAX)) ||
|
|
||||||
+ sensors_get_value(chip_name, sub_feature->number, &max))
|
|
||||||
+ max = 16;
|
|
||||||
+
|
|
||||||
+ setType(lmVoltage);
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ case SENSORS_FEATURE_FAN:
|
|
||||||
+ sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_FAN_INPUT);
|
|
||||||
+
|
|
||||||
+ if (!sub_feature)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ feature = sub_feature->number;
|
|
||||||
+
|
|
||||||
+ if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_FAN_MIN)) ||
|
|
||||||
+ sensors_get_value(chip_name, sub_feature->number, &min))
|
|
||||||
+ min = 3000;
|
|
||||||
+
|
|
||||||
+ max = 10000;
|
|
||||||
+
|
|
||||||
+ setType(lmFan);
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ case SENSORS_FEATURE_TEMP:
|
|
||||||
+ sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_TEMP_INPUT);
|
|
||||||
+
|
|
||||||
+ if (!sub_feature)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ feature = sub_feature->number;
|
|
||||||
+
|
|
||||||
+ if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_TEMP_MIN)) ||
|
|
||||||
+ sensors_get_value(chip_name, sub_feature->number, &min))
|
|
||||||
+ min = 0;
|
|
||||||
+
|
|
||||||
+ if ((!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_TEMP_MAX)) &&
|
|
||||||
+ !(sub_feature = sensors_get_subfeature(chip_name, feature_data,
|
|
||||||
+ SENSORS_SUBFEATURE_TEMP_CRIT))) ||
|
|
||||||
+ sensors_get_value(chip_name, sub_feature->number, &max))
|
|
||||||
+ max = 65;
|
|
||||||
+
|
|
||||||
+ setType(lmTemp);
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ default:
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ str.sprintf("%s.%s", chip_name->prefix, main_name);
|
|
||||||
+ setName( str.latin1() );
|
|
||||||
+
|
|
||||||
+ label = sensors_get_label(chip_name, feature_data);
|
|
||||||
+ if (label)
|
|
||||||
+ setDescription(QString(label));
|
|
||||||
+ else
|
|
||||||
+ setDescription( str.latin1() );
|
|
||||||
+
|
|
||||||
+#endif /* libsensors3 / libsensors4 code */
|
|
||||||
+
|
|
||||||
if(min>max) {
|
|
||||||
double pivot= min;
|
|
||||||
min= max;
|
|
||||||
@@ -131,7 +225,11 @@ double LMSensor::readSensorValue()
|
|
||||||
{
|
|
||||||
double newVal;
|
|
||||||
const sensors_chip_name *chip_name= getChipName();
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
sensors_get_feature(*chip_name, feature, &newVal);
|
|
||||||
+#else
|
|
||||||
+ sensors_get_value(chip_name, feature, &newVal);
|
|
||||||
+#endif
|
|
||||||
return newVal;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -up ksensors-0.7.3/src/lmsensorschip.cpp.lm_sensors3x ksensors-0.7.3/src/lmsensorschip.cpp
|
|
||||||
--- ksensors-0.7.3/src/lmsensorschip.cpp.lm_sensors3x 2003-12-27 22:52:12.000000000 +0100
|
|
||||||
+++ ksensors-0.7.3/src/lmsensorschip.cpp 2007-11-11 16:34:15.000000000 +0100
|
|
||||||
@@ -50,10 +50,15 @@ const sensors_chip_name *LMSensorsChip::
|
|
||||||
void LMSensorsChip::createSensors()
|
|
||||||
{
|
|
||||||
if(!chip_name) return;
|
|
||||||
- const sensors_feature_data *data;
|
|
||||||
int nr1= 0;
|
|
||||||
int nr2= 0;
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
+ const sensors_feature_data *data;
|
|
||||||
data= sensors_get_all_features(*chip_name, &nr1, &nr2);
|
|
||||||
+#else
|
|
||||||
+ const sensors_feature *data;
|
|
||||||
+ data= sensors_get_features(chip_name, &nr1);
|
|
||||||
+#endif
|
|
||||||
while(data) {
|
|
||||||
LMSensor *sensor= new LMSensor(this);
|
|
||||||
if( !sensor->init(&data,&nr1,&nr2) )
|
|
||||||
diff -up ksensors-0.7.3/src/lmsensor.h.lm_sensors3x ksensors-0.7.3/src/lmsensor.h
|
|
||||||
--- ksensors-0.7.3/src/lmsensor.h.lm_sensors3x 2003-12-27 22:52:12.000000000 +0100
|
|
||||||
+++ ksensors-0.7.3/src/lmsensor.h 2007-11-11 16:34:15.000000000 +0100
|
|
||||||
@@ -51,7 +51,11 @@ protected:
|
|
||||||
|
|
||||||
double calculateIdealValue();
|
|
||||||
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
bool init(const sensors_feature_data **data, int *nr1,int *nr2);
|
|
||||||
+#else
|
|
||||||
+ bool init(const sensors_feature **data, int *nr1,int *nr2);
|
|
||||||
+#endif
|
|
||||||
const sensors_chip_name *getChipName();
|
|
||||||
|
|
||||||
private:
|
|
||||||
diff -up ksensors-0.7.3/src/lmsensors.cpp.lm_sensors3x ksensors-0.7.3/src/lmsensors.cpp
|
|
||||||
--- ksensors-0.7.3/src/lmsensors.cpp.lm_sensors3x 2007-11-11 16:34:15.000000000 +0100
|
|
||||||
+++ ksensors-0.7.3/src/lmsensors.cpp 2007-11-11 16:34:15.000000000 +0100
|
|
||||||
@@ -45,17 +45,23 @@ LMSensors::~LMSensors()
|
|
||||||
|
|
||||||
bool LMSensors::initSensors()
|
|
||||||
{
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
FILE *fp=fopen("/etc/sensors.conf","r");
|
|
||||||
if(!fp) {
|
|
||||||
qWarning("KSensors error: /etc/sensors.conf not found !");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ FILE *fp=NULL;
|
|
||||||
+#endif
|
|
||||||
int err= sensors_init(fp);
|
|
||||||
if(err) {
|
|
||||||
qWarning("KSensors error: sensors_init fail, error code %d",err);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
fclose(fp);
|
|
||||||
+#endif
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -63,6 +69,7 @@ void LMSensors::createLMSensors()
|
|
||||||
{
|
|
||||||
const sensors_chip_name *chip_name;
|
|
||||||
int err= 0;
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
while( (chip_name= sensors_get_detected_chips(&err)) )
|
|
||||||
{
|
|
||||||
if( existSensor(chip_name,"temp") ||
|
|
||||||
@@ -71,6 +78,10 @@ void LMSensors::createLMSensors()
|
|
||||||
(void)new LMSensorsChip(chip_name,this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ while( (chip_name= sensors_get_detected_chips(NULL, &err)) )
|
|
||||||
+ (void)new LMSensorsChip(chip_name,this);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void LMSensors::createHDSensors()
|
|
||||||
@@ -86,6 +97,7 @@ void LMSensors::createI8KSensors()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
int LMSensors::existSensor(const sensors_chip_name *chip_name,const char *sensor_name)
|
|
||||||
{
|
|
||||||
int nr1,nr2;
|
|
||||||
@@ -99,6 +111,7 @@ const sensors_feature_data *sensor_data;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
void LMSensors::setMonitorized(bool enable)
|
|
||||||
{
|
|
||||||
diff -up ksensors-0.7.3/src/lmsensors.h.lm_sensors3x ksensors-0.7.3/src/lmsensors.h
|
|
||||||
--- ksensors-0.7.3/src/lmsensors.h.lm_sensors3x 2003-12-27 22:52:12.000000000 +0100
|
|
||||||
+++ ksensors-0.7.3/src/lmsensors.h 2007-11-11 16:34:15.000000000 +0100
|
|
||||||
@@ -65,7 +65,9 @@ private:
|
|
||||||
void createI8KSensors();
|
|
||||||
void childEvent ( QChildEvent *e );
|
|
||||||
|
|
||||||
+#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
static int existSensor(const sensors_chip_name *chip_name,const char *sensor_name);
|
|
||||||
+#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
--- ksensors-0.7.3/po/Makefile.in~ 2004-08-19 00:39:08.000000000 +0300
|
|
||||||
+++ ksensors-0.7.3/po/Makefile.in 2007-06-26 22:05:56.000000000 +0300
|
|
||||||
@@ -255,8 +255,8 @@ xdg_appsdir = @xdg_appsdir@
|
|
||||||
xdg_directorydir = @xdg_directorydir@
|
|
||||||
#>- POFILES = AUTO
|
|
||||||
#>+ 2
|
|
||||||
-POFILES = nl.po fr.po es.po de.po cs.po
|
|
||||||
-GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo
|
|
||||||
+POFILES = nl.po fr.po es.po de.po cs.po it.po pl.po sv.po nb.po
|
|
||||||
+GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo it.gmo pl.gmo sv.gmo nb.gmo
|
|
||||||
subdir = po
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
|
|
||||||
CONFIG_HEADER = $(top_builddir)/config.h
|
|
||||||
@@ -431,6 +431,18 @@ de.gmo: de.po
|
|
||||||
cs.gmo: cs.po
|
|
||||||
rm -f cs.gmo; $(GMSGFMT) -o cs.gmo $(srcdir)/cs.po
|
|
||||||
test ! -f cs.gmo || touch cs.gmo
|
|
||||||
+it.gmo: it.po
|
|
||||||
+ rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po
|
|
||||||
+ test ! -f it.gmo || touch it.gmo
|
|
||||||
+nb.gmo: nb.po
|
|
||||||
+ rm -f nb.gmo; $(GMSGFMT) -o nb.gmo $(srcdir)/nb.po
|
|
||||||
+ test ! -f nb.gmo || touch nb.gmo
|
|
||||||
+pl.gmo: pl.po
|
|
||||||
+ rm -f pl.gmo; $(GMSGFMT) -o pl.gmo $(srcdir)/pl.po
|
|
||||||
+ test ! -f pl.gmo || touch pl.gmo
|
|
||||||
+sv.gmo: sv.po
|
|
||||||
+ rm -f sv.gmo; $(GMSGFMT) -o sv.gmo $(srcdir)/sv.po
|
|
||||||
+ test ! -f sv.gmo || touch sv.gmo
|
|
||||||
|
|
||||||
#>+ 3
|
|
||||||
clean-nls:
|
|
||||||
@@ -438,7 +450,7 @@ clean-nls:
|
|
||||||
|
|
||||||
#>+ 10
|
|
||||||
install-nls:
|
|
||||||
- @for base in nl fr es de cs ; do \
|
|
||||||
+ @for base in nl fr es de cs it pl sv nb ; do \
|
|
||||||
echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
|
|
||||||
if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
--- ksensors-0.7.3/admin/acinclude.m4.in.tdeinc 2003-09-09 16:44:53.000000000 +0200
|
|
||||||
+++ ksensors-0.7.3/admin/acinclude.m4.in 2012-10-07 11:10:55.098502427 +0200
|
|
||||||
@@ -459,14 +459,14 @@
|
|
||||||
if test "$kde_qtver" = "2"; then
|
|
||||||
kde_moduledir='\${libdir}/kde2'
|
|
||||||
else
|
|
||||||
- kde_moduledir='\${libdir}/kde3'
|
|
||||||
+ kde_moduledir='\${libdir}/trinity'
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$kde_styledir"; then
|
|
||||||
- kde_styledir='\${libdir}/kde3/plugins/styles'
|
|
||||||
+ kde_styledir='\${libdir}/trinity/plugins/styles'
|
|
||||||
fi
|
|
||||||
if test -z "$kde_widgetdir"; then
|
|
||||||
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
|
|
||||||
+ kde_widgetdir='\${libdir}/trinity/plugins/designer'
|
|
||||||
fi
|
|
||||||
if test -z "$xdg_appsdir"; then
|
|
||||||
xdg_appsdir='\${datadir}/applications'
|
|
||||||
@@ -528,7 +528,7 @@
|
|
||||||
)
|
|
||||||
AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
|
|
||||||
|
|
||||||
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
|
|
||||||
+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
|
|
||||||
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
|
|
||||||
if test -n "$KDEDIRS"; then
|
|
||||||
kde_save_IFS=$IFS
|
|
||||||
@@ -549,7 +549,7 @@
|
|
||||||
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
|
|
||||||
|
|
||||||
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
|
|
||||||
- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
|
|
||||||
+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
|
|
||||||
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
|
|
||||||
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
|
|
||||||
if test "$KDE_XSL_STYLESHEET" = "NO"; then
|
|
||||||
@@ -1688,8 +1688,8 @@
|
|
||||||
|
|
||||||
if test -z "$1"; then
|
|
||||||
|
|
||||||
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
|
|
||||||
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
|
|
||||||
+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
|
|
||||||
+test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR/include/kde $KDEDIR $kde_incdirs"
|
|
||||||
kde_incdirs="$ac_kde_includes $kde_incdirs"
|
|
||||||
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
|
|
||||||
ac_kde_includes="$kde_incdir"
|
|
||||||
@@ -1700,7 +1700,7 @@
|
|
||||||
So, check this please and use another prefix!])
|
|
||||||
fi
|
|
||||||
|
|
||||||
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
|
||||||
+kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
|
||||||
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
|
|
||||||
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
|
|
||||||
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
|
|
||||||
@@ -1708,7 +1708,7 @@
|
|
||||||
|
|
||||||
kde_widgetdir=NO
|
|
||||||
dnl this might be somewhere else
|
|
||||||
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
|
|
||||||
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
|
|
||||||
|
|
||||||
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
|
|
||||||
AC_MSG_ERROR([
|
|
||||||
@@ -1716,14 +1716,14 @@
|
|
||||||
So, check this please and use another prefix!])
|
|
||||||
fi
|
|
||||||
|
|
||||||
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
|
|
||||||
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
|
|
||||||
AC_MSG_ERROR([
|
|
||||||
I can't find the designer plugins. These are required and should have been installed
|
|
||||||
by kdelibs])
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$kde_widgetdir"; then
|
|
||||||
- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
|
|
||||||
+ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,102 +0,0 @@
|
|||||||
diff -Nuar ksensors-0.7.3.ORI//configure ksensors-0.7.3.P//configure
|
|
||||||
--- ksensors-0.7.3.ORI//configure 2004-08-18 23:37:56.000000000 +0200
|
|
||||||
+++ ksensors-0.7.3.P//configure 2011-11-07 22:55:46.555892050 +0100
|
|
||||||
@@ -25119,7 +25119,7 @@
|
|
||||||
|
|
||||||
if test -z ""; then
|
|
||||||
|
|
||||||
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
|
|
||||||
+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/trinity/include/kde $x_includes $qt_includes"
|
|
||||||
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
|
|
||||||
kde_incdirs="$ac_kde_includes $kde_incdirs"
|
|
||||||
|
|
||||||
@@ -25149,7 +25149,7 @@
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
|
||||||
+kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
|
||||||
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
|
|
||||||
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
|
|
||||||
|
|
||||||
@@ -25174,7 +25174,7 @@
|
|
||||||
kde_widgetdir=NO
|
|
||||||
for i in $kde_libdirs;
|
|
||||||
do
|
|
||||||
- for j in "kde3/plugins/designer/kdewidgets.la";
|
|
||||||
+ for j in "trinity/plugins/designer/kdewidgets.la";
|
|
||||||
do
|
|
||||||
echo "configure: 25179: $i/$j" >&5
|
|
||||||
if test -r "$i/$j"; then
|
|
||||||
@@ -25196,7 +25196,7 @@
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
|
|
||||||
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
|
|
||||||
{ { echo "$as_me:$LINENO: error:
|
|
||||||
I can't find the designer plugins. These are required and should have been installed
|
|
||||||
by kdelibs" >&5
|
|
||||||
@@ -25207,7 +25207,7 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$kde_widgetdir"; then
|
|
||||||
- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
|
|
||||||
+ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
@@ -25428,14 +25428,14 @@
|
|
||||||
if test "$kde_qtver" = "2"; then
|
|
||||||
kde_moduledir='\${libdir}/kde2'
|
|
||||||
else
|
|
||||||
- kde_moduledir='\${libdir}/kde3'
|
|
||||||
+ kde_moduledir='\${libdir}/trinity'
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$kde_styledir"; then
|
|
||||||
- kde_styledir='\${libdir}/kde3/plugins/styles'
|
|
||||||
+ kde_styledir='\${libdir}/trinity/plugins/styles'
|
|
||||||
fi
|
|
||||||
if test -z "$kde_widgetdir"; then
|
|
||||||
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
|
|
||||||
+ kde_widgetdir='\${libdir}/trinity/plugins/designer'
|
|
||||||
fi
|
|
||||||
if test -z "$xdg_appsdir"; then
|
|
||||||
xdg_appsdir='\${datadir}/applications'
|
|
||||||
@@ -25716,14 +25716,14 @@
|
|
||||||
if test "$kde_qtver" = "2"; then
|
|
||||||
kde_moduledir='\${libdir}/kde2'
|
|
||||||
else
|
|
||||||
- kde_moduledir='\${libdir}/kde3'
|
|
||||||
+ kde_moduledir='\${libdir}/trinity'
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$kde_styledir"; then
|
|
||||||
- kde_styledir='\${libdir}/kde3/plugins/styles'
|
|
||||||
+ kde_styledir='\${libdir}/trinity/plugins/styles'
|
|
||||||
fi
|
|
||||||
if test -z "$kde_widgetdir"; then
|
|
||||||
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
|
|
||||||
+ kde_widgetdir='\${libdir}/trinity/plugins/designer'
|
|
||||||
fi
|
|
||||||
if test -z "$xdg_appsdir"; then
|
|
||||||
xdg_appsdir='\${datadir}/applications'
|
|
||||||
@@ -25982,7 +25982,7 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
|
|
||||||
+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
|
|
||||||
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
|
|
||||||
if test -n "$KDEDIRS"; then
|
|
||||||
kde_save_IFS=$IFS
|
|
||||||
@@ -26377,7 +26377,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
|
|
||||||
- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
|
|
||||||
+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
|
|
||||||
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
|
|
||||||
|
|
||||||
KDE_XSL_STYLESHEET=NO
|
|
||||||
Binary file not shown.
@ -1,268 +0,0 @@
|
|||||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
|
||||||
%if "%{?_prefix}" != "/usr"
|
|
||||||
%define _variant .opt
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# TDE 3.5.13 specific building variables
|
|
||||||
%define tde_bindir %{tde_prefix}/bin
|
|
||||||
%define tde_datadir %{tde_prefix}/share
|
|
||||||
%define tde_docdir %{tde_datadir}/doc
|
|
||||||
%define tde_includedir %{tde_prefix}/include
|
|
||||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
|
||||||
%define tde_mandir %{tde_datadir}/man
|
|
||||||
|
|
||||||
%define tde_tdeappdir %{tde_datadir}/applications/kde
|
|
||||||
%define tde_tdedocdir %{tde_docdir}/tde
|
|
||||||
%define tde_tdeincludedir %{tde_includedir}/tde
|
|
||||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
|
||||||
|
|
||||||
%define _docdir %{tde_docdir}
|
|
||||||
|
|
||||||
Name: trinity-ksensors
|
|
||||||
Version: 0.7.3
|
|
||||||
Release: 19p3%{?dist}%{?_variant}
|
|
||||||
|
|
||||||
Summary: KDE frontend to lm_sensors
|
|
||||||
Group: Applications/System
|
|
||||||
License: GPLv2+
|
|
||||||
URL: http://ksensors.sourceforge.net/
|
|
||||||
|
|
||||||
Source0: http://downloads.sourceforge.net/ksensors/ksensors-%{version}.tar.gz
|
|
||||||
|
|
||||||
# Debian (upstream) patch
|
|
||||||
Patch2: ksensors_0.7.3-18.diff
|
|
||||||
# Fix 'lmsensor.cpp' for older lm_sensors API (< 3.x)
|
|
||||||
Patch7: ksensors-0.7.3-18-lmsensors_2x_fix.patch
|
|
||||||
# [ksensors] Fix autotools detection
|
|
||||||
Patch9: ksensors-0.7.3-fix_autotools_detection.patch
|
|
||||||
# Fix TDE directories detection
|
|
||||||
Patch10: ksensors-0.7.3-tde_includedir.patch
|
|
||||||
# Fix sound installation
|
|
||||||
Patch11: ksensors-0.7.3-fix_sound_installation.patch
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
|
|
||||||
BuildRequires: gettext
|
|
||||||
BuildRequires: desktop-file-utils
|
|
||||||
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
BuildRequires: libsensors4-devel
|
|
||||||
%else
|
|
||||||
BuildRequires: lm_sensors-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Keep archs in sync with lm_sensors
|
|
||||||
ExcludeArch: s390 s390x
|
|
||||||
|
|
||||||
%description
|
|
||||||
KSensors is a nice lm-sensors frontend for the K Desktop Environment.
|
|
||||||
Install the hddtemp package if you wish to monitor hard disk
|
|
||||||
temperatures with KSensors.
|
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
%debug_package
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q -n ksensors-%{version}
|
|
||||||
%patch2 -p1 -b .debian
|
|
||||||
%patch7 -p1 -b .lm2x
|
|
||||||
%patch9 -p1 -b .autotools
|
|
||||||
%patch10 -p1 -b .tdeinc
|
|
||||||
%patch11 -p1 -b .sound
|
|
||||||
|
|
||||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
|
||||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
|
||||||
%__sed -i admin/acinclude.m4.in \
|
|
||||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
|
||||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
|
||||||
|
|
||||||
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
|
||||||
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
|
||||||
%__make -f "admin/Makefile.common"
|
|
||||||
|
|
||||||
%__sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
|
|
||||||
for f in ChangeLog LIESMICH LISEZMOI ; do
|
|
||||||
iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
|
|
||||||
done
|
|
||||||
|
|
||||||
%build
|
|
||||||
unset QTDIR; . /etc/profile.d/qt3.sh
|
|
||||||
export PATH="%{tde_bindir}:${PATH}"
|
|
||||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
|
||||||
|
|
||||||
export KDEDIR=%{tde_prefix}
|
|
||||||
|
|
||||||
%configure \
|
|
||||||
--prefix=%{tde_prefix} \
|
|
||||||
--exec-prefix=%{tde_prefix} \
|
|
||||||
--disable-dependency-tracking \
|
|
||||||
--disable-rpath \
|
|
||||||
--with-extra-includes=%{tde_includedir}/tqt \
|
|
||||||
--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
|
|
||||||
--bindir=%{tde_bindir} \
|
|
||||||
--libdir=%{tde_libdir} \
|
|
||||||
--datadir=%{tde_datadir} \
|
|
||||||
--includedir=%{tde_tdeincludedir}
|
|
||||||
|
|
||||||
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
%__rm -rf $RPM_BUILD_ROOT
|
|
||||||
%__make install DESTDIR=$RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
# Creates autostart shortcut
|
|
||||||
%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart
|
|
||||||
%__ln_s ../applnk/Utilities/ksensors.desktop \
|
|
||||||
$RPM_BUILD_ROOT%{tde_datadir}/autostart
|
|
||||||
|
|
||||||
#__rm -rf $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML
|
|
||||||
|
|
||||||
%find_lang ksensors
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
%__rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
%post
|
|
||||||
for f in locolor hicolor ; do
|
|
||||||
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
done
|
|
||||||
|
|
||||||
%postun
|
|
||||||
for f in locolor hicolor ; do
|
|
||||||
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
%files -f ksensors.lang
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc AUTHORS ChangeLog COPYING FAQ README TODO
|
|
||||||
%lang(es) %doc LEEME
|
|
||||||
%lang(de) %doc LIESMICH
|
|
||||||
%lang(fr) %doc LISEZMOI
|
|
||||||
%{tde_bindir}/ksensors
|
|
||||||
%{tde_datadir}/applnk/Utilities/ksensors.desktop
|
|
||||||
%{tde_datadir}/apps/ksensors/
|
|
||||||
%{tde_datadir}/autostart/ksensors.desktop
|
|
||||||
%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
|
|
||||||
%{tde_datadir}/icons/locolor/
|
|
||||||
%{tde_datadir}/sounds/ksensors_alert.wav
|
|
||||||
%{tde_tdedocdir}/HTML/en/ksensors/
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
|
|
||||||
- Initial release for TDE 3.5.13.1
|
|
||||||
|
|
||||||
* Thu Dec 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p2
|
|
||||||
- Update Debian patch to -18 release
|
|
||||||
|
|
||||||
* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p1
|
|
||||||
- Rebuilt for RHEL 6, RHEL 5, Fedora 15 with TDE 3.5.13
|
|
||||||
|
|
||||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-19
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-18
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-17
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 15 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-16
|
|
||||||
- Update Debian patch to -15 release
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-15
|
|
||||||
- Change BuildRequires: kdelibs-devel into kdelibs3-devel
|
|
||||||
|
|
||||||
* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-14
|
|
||||||
- Patch for and Rebuild against lm_sensors-3.0.0
|
|
||||||
|
|
||||||
* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-13
|
|
||||||
- Fix reading of min and max tresholds from libsensors
|
|
||||||
|
|
||||||
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-12
|
|
||||||
- Update License tag for new Licensing Guidelines compliance
|
|
||||||
|
|
||||||
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-11
|
|
||||||
- Remove OnlyShowIn=KDE; from .desktop file (I like using ksensors under GNOME,
|
|
||||||
works fine grumbel)
|
|
||||||
|
|
||||||
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-10
|
|
||||||
- Add icon-cache update scriptlets
|
|
||||||
- Add Requires: hicolor-icon-theme for dir ownership
|
|
||||||
|
|
||||||
* Fri Jul 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-9
|
|
||||||
- Sync Exclu(de|sive)Arch with new lm_sensors (#249060).
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-8
|
|
||||||
- Update Debian patchset to -14 for additional fixes and translations;
|
|
||||||
drop our hddtemp detection patch in favour of the one included in it.
|
|
||||||
- Drop Application and X-Fedora categories from .desktop file, add GenericName.
|
|
||||||
- Make autostart checkbox effective again (#242570).
|
|
||||||
- Convert docs to UTF-8.
|
|
||||||
|
|
||||||
* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-7
|
|
||||||
- Apply Debian -11 patchset for upstream radio button state fix,
|
|
||||||
support for hddtemp with SCSI disks and more translations.
|
|
||||||
|
|
||||||
* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-6
|
|
||||||
- Rebuild.
|
|
||||||
|
|
||||||
* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-5
|
|
||||||
- Rebuild.
|
|
||||||
|
|
||||||
* Thu Nov 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-4
|
|
||||||
- Clean up build dependencies.
|
|
||||||
|
|
||||||
* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-3
|
|
||||||
- Sync arch availability with FC4 lm_sensors (%%{ix86}, x86_64, alpha).
|
|
||||||
- Reduce directory ownership bloat.
|
|
||||||
|
|
||||||
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.3-2
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Sat Aug 21 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.3-0.fdr.1
|
|
||||||
- Update to 0.7.3, most patches applied upstream.
|
|
||||||
- Disable dependency tracking to speed up the build.
|
|
||||||
|
|
||||||
* Tue Jul 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.4
|
|
||||||
- Force use of multithreaded Qt with --enable-mt to fix build on FC2.
|
|
||||||
- Sync Debian patch to 0.7.2-16 to get a fix for freeze with hddtemp.
|
|
||||||
- Apply upstream patches #913569 and #915725.
|
|
||||||
- Disable RPATH.
|
|
||||||
- Don't ship the "handbook", it's just a template.
|
|
||||||
- Other minor improvements here and there.
|
|
||||||
|
|
||||||
* Sat Aug 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.3
|
|
||||||
- Own dirs under %%{_datadir}/icons and %%{_docdir}/HTML (bug 21).
|
|
||||||
- Don't tweak path to hddtemp.
|
|
||||||
- Patch to fix hddtemp detection.
|
|
||||||
- s/--enable-xinerama/--with-xinerama/
|
|
||||||
- Borrow man page from Debian.
|
|
||||||
|
|
||||||
* Sat May 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.2
|
|
||||||
- Spec cleanups.
|
|
||||||
|
|
||||||
* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.1
|
|
||||||
- Update to current Fedora guidelines.
|
|
||||||
- Move desktop entry to %%{_datadir}/applications using desktop-file-install.
|
|
||||||
|
|
||||||
* Sun Feb 23 2003 Warren Togami <warren@togami.com> - 0.7.2-1.fedora.2
|
|
||||||
- BuildRequires libart_lgpl-devel needed for Red Hat 8.1
|
|
||||||
|
|
||||||
* Sun Feb 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1.fedora.1
|
|
||||||
- Update to 0.7.2.
|
|
||||||
- Don't apply startup crash patch, but keep it around for now.
|
|
||||||
|
|
||||||
* Sat Feb 15 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.2
|
|
||||||
- Include startup crash patch from upstream SRPM.
|
|
||||||
|
|
||||||
* Sun Feb 9 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.1
|
|
||||||
- First Fedora release.
|
|
||||||
@ -1,271 +0,0 @@
|
|||||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
|
||||||
%if "%{?tde_prefix}" != "/usr"
|
|
||||||
%define _variant .opt
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# TDE 3.5.13 specific building variables
|
|
||||||
%define tde_bindir %{tde_prefix}/bin
|
|
||||||
%define tde_datadir %{tde_prefix}/share
|
|
||||||
%define tde_docdir %{tde_datadir}/doc
|
|
||||||
%define tde_includedir %{tde_prefix}/include
|
|
||||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
|
||||||
%define tde_mandir %{tde_datadir}/man
|
|
||||||
|
|
||||||
%define tde_tdeappdir %{tde_datadir}/applications/kde
|
|
||||||
%define tde_tdedocdir %{tde_docdir}/tde
|
|
||||||
%define tde_tdeincludedir %{tde_includedir}/tde
|
|
||||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
|
||||||
|
|
||||||
%define _docdir %{tde_docdir}
|
|
||||||
|
|
||||||
Name: trinity-ksensors
|
|
||||||
Version: 0.7.3
|
|
||||||
Release: 20%{?dist}%{?_variant}
|
|
||||||
|
|
||||||
Summary: Trinity Frontend to lm_sensors
|
|
||||||
Group: Applications/System
|
|
||||||
License: GPLv2+
|
|
||||||
URL: http://ksensors.sourceforge.net/
|
|
||||||
|
|
||||||
Source0: http://downloads.sourceforge.net/ksensors/ksensors-0.7.3.tar.gz
|
|
||||||
|
|
||||||
# Debian (upstream) patch
|
|
||||||
Patch2: ksensors_0.7.3-18.diff
|
|
||||||
# Fix 'lmsensor.cpp' for older lm_sensors API (< 3.x)
|
|
||||||
Patch7: ksensors-0.7.3-18-lmsensors_2x_fix.patch
|
|
||||||
# [ksensors] Fix autotools detection
|
|
||||||
Patch9: ksensors-0.7.3-fix_autotools_detection.patch
|
|
||||||
# Fix TDE directories detection
|
|
||||||
Patch10: ksensors-0.7.3-tde_includedir.patch
|
|
||||||
# Fix sound installation
|
|
||||||
Patch11: ksensors-0.7.3-fix_sound_installation.patch
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
|
|
||||||
BuildRequires: gettext
|
|
||||||
BuildRequires: desktop-file-utils
|
|
||||||
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
BuildRequires: libsensors4-devel
|
|
||||||
%else
|
|
||||||
BuildRequires: lm_sensors-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Keep archs in sync with lm_sensors
|
|
||||||
ExcludeArch: s390 s390x
|
|
||||||
|
|
||||||
%description
|
|
||||||
KSensors is a nice lm-sensors frontend for the K Desktop Environment.
|
|
||||||
Install the hddtemp package if you wish to monitor hard disk
|
|
||||||
temperatures with KSensors.
|
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?suse_version} || 0%{?pclinuxos}
|
|
||||||
%debug_package
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q -n ksensors-%{version}
|
|
||||||
%patch2 -p1 -b .debian
|
|
||||||
%patch7 -p1 -b .lm2x
|
|
||||||
%patch9 -p1 -b .autotools
|
|
||||||
%patch10 -p1 -b .tdeinc
|
|
||||||
%patch11 -p1 -b .sound
|
|
||||||
|
|
||||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
|
||||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
|
||||||
%__sed -i admin/acinclude.m4.in \
|
|
||||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
|
||||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
|
||||||
|
|
||||||
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
|
||||||
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
|
||||||
%__make -f "admin/Makefile.common"
|
|
||||||
|
|
||||||
%__sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
|
|
||||||
for f in ChangeLog LIESMICH LISEZMOI ; do
|
|
||||||
iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
|
|
||||||
done
|
|
||||||
|
|
||||||
%build
|
|
||||||
unset QTDIR; . /etc/profile.d/qt3.sh
|
|
||||||
export PATH="%{tde_bindir}:${PATH}"
|
|
||||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
|
||||||
|
|
||||||
export KDEDIR=%{tde_prefix}
|
|
||||||
|
|
||||||
%configure \
|
|
||||||
--prefix=%{tde_prefix} \
|
|
||||||
--exec-prefix=%{tde_prefix} \
|
|
||||||
--disable-dependency-tracking \
|
|
||||||
--disable-rpath \
|
|
||||||
--with-extra-includes=%{tde_includedir}/tqt \
|
|
||||||
--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
|
|
||||||
--bindir=%{tde_bindir} \
|
|
||||||
--libdir=%{tde_libdir} \
|
|
||||||
--datadir=%{tde_datadir} \
|
|
||||||
--includedir=%{tde_tdeincludedir}
|
|
||||||
|
|
||||||
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
%__rm -rf $RPM_BUILD_ROOT
|
|
||||||
%__make install DESTDIR=$RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
# Creates autostart shortcut
|
|
||||||
%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart
|
|
||||||
%__ln_s ../applnk/Utilities/ksensors.desktop \
|
|
||||||
$RPM_BUILD_ROOT%{tde_datadir}/autostart
|
|
||||||
|
|
||||||
#__rm -rf $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML
|
|
||||||
|
|
||||||
%find_lang ksensors
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
%__rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
%post
|
|
||||||
for f in locolor hicolor ; do
|
|
||||||
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
done
|
|
||||||
|
|
||||||
%postun
|
|
||||||
for f in locolor hicolor ; do
|
|
||||||
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
%files -f ksensors.lang
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc AUTHORS ChangeLog COPYING FAQ README TODO
|
|
||||||
%lang(es) %doc LEEME
|
|
||||||
%lang(de) %doc LIESMICH
|
|
||||||
%lang(fr) %doc LISEZMOI
|
|
||||||
%{tde_bindir}/ksensors
|
|
||||||
%{tde_datadir}/applnk/Utilities/ksensors.desktop
|
|
||||||
%{tde_datadir}/apps/ksensors/
|
|
||||||
%{tde_datadir}/autostart/ksensors.desktop
|
|
||||||
%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
|
|
||||||
%{tde_datadir}/icons/locolor/
|
|
||||||
%{tde_datadir}/sounds/ksensors_alert.wav
|
|
||||||
%{tde_tdedocdir}/HTML/en/ksensors/
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-20
|
|
||||||
- Initial release for TDE 3.5.13.2
|
|
||||||
|
|
||||||
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
|
|
||||||
- Initial release for TDE 3.5.13.1
|
|
||||||
|
|
||||||
* Thu Dec 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p2
|
|
||||||
- Update Debian patch to -18 release
|
|
||||||
|
|
||||||
* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p1
|
|
||||||
- Rebuilt for RHEL 6, RHEL 5, Fedora 15 with TDE 3.5.13
|
|
||||||
|
|
||||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-19
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-18
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-17
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 15 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-16
|
|
||||||
- Update Debian patch to -15 release
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-15
|
|
||||||
- Change BuildRequires: kdelibs-devel into kdelibs3-devel
|
|
||||||
|
|
||||||
* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-14
|
|
||||||
- Patch for and Rebuild against lm_sensors-3.0.0
|
|
||||||
|
|
||||||
* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-13
|
|
||||||
- Fix reading of min and max tresholds from libsensors
|
|
||||||
|
|
||||||
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-12
|
|
||||||
- Update License tag for new Licensing Guidelines compliance
|
|
||||||
|
|
||||||
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-11
|
|
||||||
- Remove OnlyShowIn=KDE; from .desktop file (I like using ksensors under GNOME,
|
|
||||||
works fine grumbel)
|
|
||||||
|
|
||||||
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-10
|
|
||||||
- Add icon-cache update scriptlets
|
|
||||||
- Add Requires: hicolor-icon-theme for dir ownership
|
|
||||||
|
|
||||||
* Fri Jul 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-9
|
|
||||||
- Sync Exclu(de|sive)Arch with new lm_sensors (#249060).
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-8
|
|
||||||
- Update Debian patchset to -14 for additional fixes and translations;
|
|
||||||
drop our hddtemp detection patch in favour of the one included in it.
|
|
||||||
- Drop Application and X-Fedora categories from .desktop file, add GenericName.
|
|
||||||
- Make autostart checkbox effective again (#242570).
|
|
||||||
- Convert docs to UTF-8.
|
|
||||||
|
|
||||||
* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-7
|
|
||||||
- Apply Debian -11 patchset for upstream radio button state fix,
|
|
||||||
support for hddtemp with SCSI disks and more translations.
|
|
||||||
|
|
||||||
* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-6
|
|
||||||
- Rebuild.
|
|
||||||
|
|
||||||
* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-5
|
|
||||||
- Rebuild.
|
|
||||||
|
|
||||||
* Thu Nov 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-4
|
|
||||||
- Clean up build dependencies.
|
|
||||||
|
|
||||||
* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-3
|
|
||||||
- Sync arch availability with FC4 lm_sensors (%%{ix86}, x86_64, alpha).
|
|
||||||
- Reduce directory ownership bloat.
|
|
||||||
|
|
||||||
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.3-2
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Sat Aug 21 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.3-0.fdr.1
|
|
||||||
- Update to 0.7.3, most patches applied upstream.
|
|
||||||
- Disable dependency tracking to speed up the build.
|
|
||||||
|
|
||||||
* Tue Jul 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.4
|
|
||||||
- Force use of multithreaded Qt with --enable-mt to fix build on FC2.
|
|
||||||
- Sync Debian patch to 0.7.2-16 to get a fix for freeze with hddtemp.
|
|
||||||
- Apply upstream patches #913569 and #915725.
|
|
||||||
- Disable RPATH.
|
|
||||||
- Don't ship the "handbook", it's just a template.
|
|
||||||
- Other minor improvements here and there.
|
|
||||||
|
|
||||||
* Sat Aug 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.3
|
|
||||||
- Own dirs under %%{_datadir}/icons and %%{_docdir}/HTML (bug 21).
|
|
||||||
- Don't tweak path to hddtemp.
|
|
||||||
- Patch to fix hddtemp detection.
|
|
||||||
- s/--enable-xinerama/--with-xinerama/
|
|
||||||
- Borrow man page from Debian.
|
|
||||||
|
|
||||||
* Sat May 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.2
|
|
||||||
- Spec cleanups.
|
|
||||||
|
|
||||||
* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.1
|
|
||||||
- Update to current Fedora guidelines.
|
|
||||||
- Move desktop entry to %%{_datadir}/applications using desktop-file-install.
|
|
||||||
|
|
||||||
* Sun Feb 23 2003 Warren Togami <warren@togami.com> - 0.7.2-1.fedora.2
|
|
||||||
- BuildRequires libart_lgpl-devel needed for Red Hat 8.1
|
|
||||||
|
|
||||||
* Sun Feb 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1.fedora.1
|
|
||||||
- Update to 0.7.2.
|
|
||||||
- Don't apply startup crash patch, but keep it around for now.
|
|
||||||
|
|
||||||
* Sat Feb 15 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.2
|
|
||||||
- Include startup crash patch from upstream SRPM.
|
|
||||||
|
|
||||||
* Sun Feb 9 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.1
|
|
||||||
- First Fedora release.
|
|
||||||
@ -1,212 +0,0 @@
|
|||||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
|
||||||
%if "%{?_prefix}" != "/usr"
|
|
||||||
%define _variant .opt
|
|
||||||
%define _docdir %{_prefix}/share/doc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: trinity-ksensors
|
|
||||||
Version: 0.7.3
|
|
||||||
Release: 19p2%{?dist}
|
|
||||||
|
|
||||||
Summary: KDE frontend to lm_sensors
|
|
||||||
Group: Applications/System
|
|
||||||
License: GPLv2+
|
|
||||||
URL: http://ksensors.sourceforge.net/
|
|
||||||
|
|
||||||
Source0: http://downloads.sourceforge.net/ksensors/ksensors-%{version}.tar.gz
|
|
||||||
|
|
||||||
# Debian (upstream) patch
|
|
||||||
Patch2: http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-18.diff.gz
|
|
||||||
|
|
||||||
# Fix building on TDE
|
|
||||||
Patch6: ksensors-0.7.3-trinity.patch
|
|
||||||
|
|
||||||
# Fix 'lmsensor.cpp' for older lm_sensors API (< 3.x)
|
|
||||||
Patch7: ksensors-0.7.3-18-lmsensors_2x_fix.patch
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
BuildRequires: trinity-kdelibs-devel
|
|
||||||
BuildRequires: lm_sensors-devel gettext desktop-file-utils
|
|
||||||
Requires: hicolor-icon-theme
|
|
||||||
|
|
||||||
# Keep archs in sync with lm_sensors
|
|
||||||
ExcludeArch: s390 s390x
|
|
||||||
|
|
||||||
%description
|
|
||||||
KSensors is a nice lm-sensors frontend for the K Desktop Environment.
|
|
||||||
Install the hddtemp package if you wish to monitor hard disk
|
|
||||||
temperatures with KSensors.
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q -n ksensors-%{version}
|
|
||||||
%patch2 -p1
|
|
||||||
%patch6 -p1
|
|
||||||
%patch7 -p1
|
|
||||||
%__sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
|
|
||||||
for f in ChangeLog LIESMICH LISEZMOI ; do
|
|
||||||
iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
|
|
||||||
done
|
|
||||||
|
|
||||||
%build
|
|
||||||
unset QTDIR ; . /etc/profile.d/qt.sh
|
|
||||||
|
|
||||||
%configure \
|
|
||||||
--disable-dependency-tracking \
|
|
||||||
--disable-rpath \
|
|
||||||
--with-extra-includes=%{_includedir}/tqt
|
|
||||||
%__make %{?_smp_mflags}
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
%__rm -rf $RPM_BUILD_ROOT
|
|
||||||
%__make install DESTDIR=$RPM_BUILD_ROOT
|
|
||||||
desktop-file-install --vendor fedora --mode 644 --delete-original \
|
|
||||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
|
||||||
$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/ksensors.desktop
|
|
||||||
%__install -dm 755 $RPM_BUILD_ROOT%{_datadir}/autostart
|
|
||||||
%__ln_s ../applications/fedora-ksensors.desktop \
|
|
||||||
$RPM_BUILD_ROOT%{_datadir}/autostart
|
|
||||||
%__rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML
|
|
||||||
%find_lang ksensors
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
%__rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
%post
|
|
||||||
for f in locolor hicolor ; do
|
|
||||||
touch --no-create %{_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
done
|
|
||||||
|
|
||||||
%postun
|
|
||||||
for f in locolor hicolor ; do
|
|
||||||
touch --no-create %{_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null || :
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
%files -f ksensors.lang
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc AUTHORS ChangeLog COPYING FAQ README TODO
|
|
||||||
%lang(es) %doc LEEME
|
|
||||||
%lang(de) %doc LIESMICH
|
|
||||||
%lang(fr) %doc LISEZMOI
|
|
||||||
%{_bindir}/ksensors
|
|
||||||
%{_datadir}/applications/*ksensors.desktop
|
|
||||||
%{_datadir}/apps/ksensors/
|
|
||||||
%{_datadir}/autostart/*ksensors.desktop
|
|
||||||
%{_datadir}/icons/hicolor/*x*/apps/ksensors.png
|
|
||||||
%{_datadir}/icons/locolor/
|
|
||||||
%{_datadir}/sounds/ksensors_alert.wav
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Thu Dec 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p2
|
|
||||||
- Update Debian patch to -18 release
|
|
||||||
|
|
||||||
* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p1
|
|
||||||
- Rebuilt for RHEL 6, RHEL 5, Fedora 15 with TDE 3.5.13
|
|
||||||
|
|
||||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-19
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-18
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-17
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 15 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-16
|
|
||||||
- Update Debian patch to -15 release
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-15
|
|
||||||
- Change BuildRequires: kdelibs-devel into kdelibs3-devel
|
|
||||||
|
|
||||||
* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-14
|
|
||||||
- Patch for and Rebuild against lm_sensors-3.0.0
|
|
||||||
|
|
||||||
* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-13
|
|
||||||
- Fix reading of min and max tresholds from libsensors
|
|
||||||
|
|
||||||
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-12
|
|
||||||
- Update License tag for new Licensing Guidelines compliance
|
|
||||||
|
|
||||||
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-11
|
|
||||||
- Remove OnlyShowIn=KDE; from .desktop file (I like using ksensors under GNOME,
|
|
||||||
works fine grumbel)
|
|
||||||
|
|
||||||
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-10
|
|
||||||
- Add icon-cache update scriptlets
|
|
||||||
- Add Requires: hicolor-icon-theme for dir ownership
|
|
||||||
|
|
||||||
* Fri Jul 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-9
|
|
||||||
- Sync Exclu(de|sive)Arch with new lm_sensors (#249060).
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-8
|
|
||||||
- Update Debian patchset to -14 for additional fixes and translations;
|
|
||||||
drop our hddtemp detection patch in favour of the one included in it.
|
|
||||||
- Drop Application and X-Fedora categories from .desktop file, add GenericName.
|
|
||||||
- Make autostart checkbox effective again (#242570).
|
|
||||||
- Convert docs to UTF-8.
|
|
||||||
|
|
||||||
* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-7
|
|
||||||
- Apply Debian -11 patchset for upstream radio button state fix,
|
|
||||||
support for hddtemp with SCSI disks and more translations.
|
|
||||||
|
|
||||||
* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-6
|
|
||||||
- Rebuild.
|
|
||||||
|
|
||||||
* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-5
|
|
||||||
- Rebuild.
|
|
||||||
|
|
||||||
* Thu Nov 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-4
|
|
||||||
- Clean up build dependencies.
|
|
||||||
|
|
||||||
* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-3
|
|
||||||
- Sync arch availability with FC4 lm_sensors (%%{ix86}, x86_64, alpha).
|
|
||||||
- Reduce directory ownership bloat.
|
|
||||||
|
|
||||||
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.3-2
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Sat Aug 21 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.3-0.fdr.1
|
|
||||||
- Update to 0.7.3, most patches applied upstream.
|
|
||||||
- Disable dependency tracking to speed up the build.
|
|
||||||
|
|
||||||
* Tue Jul 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.4
|
|
||||||
- Force use of multithreaded Qt with --enable-mt to fix build on FC2.
|
|
||||||
- Sync Debian patch to 0.7.2-16 to get a fix for freeze with hddtemp.
|
|
||||||
- Apply upstream patches #913569 and #915725.
|
|
||||||
- Disable RPATH.
|
|
||||||
- Don't ship the "handbook", it's just a template.
|
|
||||||
- Other minor improvements here and there.
|
|
||||||
|
|
||||||
* Sat Aug 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.3
|
|
||||||
- Own dirs under %%{_datadir}/icons and %%{_docdir}/HTML (bug 21).
|
|
||||||
- Don't tweak path to hddtemp.
|
|
||||||
- Patch to fix hddtemp detection.
|
|
||||||
- s/--enable-xinerama/--with-xinerama/
|
|
||||||
- Borrow man page from Debian.
|
|
||||||
|
|
||||||
* Sat May 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.2
|
|
||||||
- Spec cleanups.
|
|
||||||
|
|
||||||
* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.1
|
|
||||||
- Update to current Fedora guidelines.
|
|
||||||
- Move desktop entry to %%{_datadir}/applications using desktop-file-install.
|
|
||||||
|
|
||||||
* Sun Feb 23 2003 Warren Togami <warren@togami.com> - 0.7.2-1.fedora.2
|
|
||||||
- BuildRequires libart_lgpl-devel needed for Red Hat 8.1
|
|
||||||
|
|
||||||
* Sun Feb 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1.fedora.1
|
|
||||||
- Update to 0.7.2.
|
|
||||||
- Don't apply startup crash patch, but keep it around for now.
|
|
||||||
|
|
||||||
* Sat Feb 15 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.2
|
|
||||||
- Include startup crash patch from upstream SRPM.
|
|
||||||
|
|
||||||
* Sun Feb 9 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.1
|
|
||||||
- First Fedora release.
|
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -1,61 +0,0 @@
|
|||||||
--- ksensors-0.7.3.orig/src/lmsensor.cpp 2008-11-16 20:38:33.000000000 +0100
|
|
||||||
+++ ksensors-0.7.3/src/lmsensor.cpp 2008-11-16 20:27:16.000000000 +0100
|
|
||||||
@@ -40,9 +40,12 @@ bool LMSensor::init(const sensors_featur
|
|
||||||
const sensors_chip_name *chip_name= getChipName();
|
|
||||||
const char* main_name = (*data)->name;
|
|
||||||
feature= (*data)->number;
|
|
||||||
- char *label;
|
|
||||||
- QString str;
|
|
||||||
+ char *label = NULL;
|
|
||||||
+ QString uniqueSensorName;
|
|
||||||
|
|
||||||
+ uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus.nr, chip_name->addr, main_name);
|
|
||||||
+ setName(uniqueSensorName.latin1());
|
|
||||||
+
|
|
||||||
#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
|
|
||||||
bool min_found=false;
|
|
||||||
bool max_found=false;
|
|
||||||
@@ -98,12 +101,18 @@ bool LMSensor::init(const sensors_featur
|
|
||||||
min= -16;
|
|
||||||
}
|
|
||||||
|
|
||||||
- str.sprintf("%s.%s", chip_name->prefix, main_name);
|
|
||||||
- setName( str.latin1() );
|
|
||||||
-
|
|
||||||
sensors_get_label(*chip_name,feature,&label);
|
|
||||||
- setDescription(QString(label));
|
|
||||||
-
|
|
||||||
+ if (label)
|
|
||||||
+ {
|
|
||||||
+ setDescription(QString(label));
|
|
||||||
+ delete label;
|
|
||||||
+ label = NULL;
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ setDescription(uniqueSensorName.latin1());
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if(min_found)
|
|
||||||
min = valMin;
|
|
||||||
|
|
||||||
@@ -189,14 +198,15 @@ bool LMSensor::init(const sensors_featur
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
- str.sprintf("%s.%s", chip_name->prefix, main_name);
|
|
||||||
- setName( str.latin1() );
|
|
||||||
-
|
|
||||||
label = sensors_get_label(chip_name, feature_data);
|
|
||||||
if (label)
|
|
||||||
- setDescription(QString(label));
|
|
||||||
+ {
|
|
||||||
+ setDescription(QString(label));
|
|
||||||
+ delete label;
|
|
||||||
+ label = NULL;
|
|
||||||
+ }
|
|
||||||
else
|
|
||||||
- setDescription( str.latin1() );
|
|
||||||
+ setDescription( uniqueSensorName.latin1() );
|
|
||||||
|
|
||||||
#endif /* libsensors3 / libsensors4 code */
|
|
||||||
Loading…
Reference in new issue