X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcpufreqd.git;a=blobdiff_plain;f=cpufreqd.spec;h=4f16dfdd545f1a3c20e75921af52218e92fb70d8;hp=89456a8f4b6d9fc7af8b2ef8e0b67a64b626a9bb;hb=94f55881e4a3263912dd37229855a544d8149759;hpb=2a762aa3e571566ff53b4eb74868ae3b059ecbc1

diff --git a/cpufreqd.spec b/cpufreqd.spec
index 89456a8..4f16dfd 100644
--- a/cpufreqd.spec
+++ b/cpufreqd.spec
@@ -1,24 +1,27 @@
 # TODO:
 # - loading modules in init-script, if needed
-# - prepare upgrade to 2.x with plugins scheme
+# - missing plugin: nvclock, sensors
+# - move plugins into separate packages? (some is needed, because of additional deps)
 Summary:	Scales your cpu frequency
-Summary(pl):	Skalowanie czêstotliwo¶ci procesora
+Summary(pl.UTF-8):   Skalowanie częstotliwości procesora
 Name:		cpufreqd
-Version:	2.0.0
-Release:	0.1
+Version:	2.2.0
+Release:	1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/cpufreqd/%{name}-%{version}.tar.gz
-# Source0-md5:	e4327cb9e4b8503575fe655d19e091e2
+Source0:	http://dl.sourceforge.net/cpufreqd/%{name}-%{version}.tar.bz2
+# Source0-md5:	a8916004d3fb75ed43822eb978c08fc5
 Source1:	%{name}.init
-Patch0:		%{name}-am.patch
 URL:		http://cpufreqd.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	cpufrequtils-devel
 BuildRequires:	libtool
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sysfsutils-devel
+Requires(post):	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
-Requires(post):	sed
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,15 +29,14 @@ This daemon monitors /proc/apm for the battery status and scales your
 cpu frequency according to a set of rules. It is very useful for
 providing maximum battery life but good cpu speed at the same time.
 
-%description -l pl
+%description -l pl.UTF-8
 Ten demon monitoruje stan baterii przez /proc/apm i skaluje
-czêstotliwo¶æ procesora zgodnie z zestawem regu³. Jest bardzo
-przydatny do zapewniania maksymalnego czasu ¿ycia baterii, a
-jednocze¶nie dobrej szybko¶ci procesora.
+częstotliwość procesora zgodnie z zestawem reguł. Jest bardzo
+przydatny do zapewniania maksymalnego czasu życia baterii, a
+jednocześnie dobrej szybkości procesora.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -58,33 +60,28 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add cpufreqd
-
-# 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 ))
-	cat /etc/cpufreqd.conf | sed -e "s/100%/$CPUFREQD_MAX_SPEED/;  \
-						s/66%/$CPUFREQD_MHIGH_SPEED/; \
-						s/33%/$CPUFREQD_MLOW_SPEED/;  \
-						s/0%/$CPUFREQD_MIN_SPEED/;" > \
-					/etc/cpufreqd.conf
+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
 
-if [ -f /var/lock/subsys/cpufreqd ]; then
-	/etc/rc.d/init.d/cpufreqd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/cpufreqd start\" to start CPU FREQ daemon."
-fi
+/sbin/chkconfig --add cpufreqd
+%service cpufreqd restart "CPU FREQ daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/cpufreqd ]; then
-		/etc/rc.d/init.d/cpufreqd stop>&2
-	fi
+	%service cpufreqd stop
 	/sbin/chkconfig --del cpufreqd
 fi
 
@@ -92,6 +89,7 @@ fi
 %defattr(644,root,root,755)
 %doc README TODO
 %attr(754,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_bindir}/*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %{_mandir}/man?/*
 %attr(754,root,root) /etc/rc.d/init.d/%{name}