From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 6 May 2011 18:07:24 +0000 (+0000)
Subject: - rel 3
X-Git-Tag: auto/th/cpufreqd-2_4_2-3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcpufreqd.git;a=commitdiff_plain;h=1b50f02550deec0258d58c324cb025e551af3b1b

- rel 3
- eanbled sensors support (builds and works)
- removed "percent to absolute value" conversion, it's not needed

Changed files:
    cpufreqd.spec -> 1.43
---

diff --git a/cpufreqd.spec b/cpufreqd.spec
index de4cf03..a4cc182 100644
--- a/cpufreqd.spec
+++ b/cpufreqd.spec
@@ -2,7 +2,6 @@
 # TODO:
 #   - loading modules in init-script, if needed
 #   - missing plugin: nvclock
-#   - disabled plugin: sensors (needs update to build with lm_sensors 3.x)
 #   - move plugins into separate packages? (some is needed, because of additional deps)
 #   - update Polish translations
 #
@@ -10,7 +9,7 @@ Summary:	Fully configurable daemon for dynamic frequency and voltage scaling
 Summary(pl.UTF-8):	Skalowanie częstotliwości procesora
 Name:		cpufreqd
 Version:	2.4.2
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/cpufreqd/%{name}-%{version}.tar.bz2
@@ -22,6 +21,7 @@ BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cpufrequtils-devel
 BuildRequires:	libtool
+BuildRequires:	lm_sensors-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sysfsutils-devel
 Requires(post):	sed >= 4.0
@@ -58,7 +58,7 @@ jednocześnie dobrej szybkości procesora.
 %{__automake}
 %configure \
 	--libdir=%{_libdir}/%{name} \
-	--disable-sensors
+	--enable-sensors
 %{__make}
 
 %install
@@ -74,22 +74,6 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ "$1" = 1 ]; then
-	# Modify config file for 2.6
-	if [ -d /sys/devices/system/cpu/cpu0/cpufreq ] ; then
-		# translate percentages in integer values
-		CPUFREQD_MAX_SPEED=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
-		CPUFREQD_MIN_SPEED=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
-		CPUFREQD_MHIGH_SPEED=$(( $CPUFREQD_MAX_SPEED / 100 * 66 ))
-		CPUFREQD_MLOW_SPEED=$(( $CPUFREQD_MAX_SPEED / 100 * 33 ))
-		sed -i -e "s/100%/$CPUFREQD_MAX_SPEED/; \
-			s/66%/$CPUFREQD_MHIGH_SPEED/; \
-			s/33%/$CPUFREQD_MLOW_SPEED/;  \
-			s/0%/$CPUFREQD_MIN_SPEED/;" \
-			%{_sysconfdir}/cpufreqd.conf
-	fi
-fi
-
 /sbin/chkconfig --add cpufreqd
 %service cpufreqd restart "CPU FREQ daemon"