[cpupowerutils] Obsolete cpuspeed by providing our own unit/config files

[Petr Sabata]

commit 13a077e6b5a1ec95ba05d5ba4508890d6172630d
Author: Petr Sabata <contyk at redhat.com>
Date:   Fri Jul 8 11:03:42 2011 +0200

    Obsolete cpuspeed by providing our own unit/config files

 cpupower.config    |    2 ++
 cpupower.service   |   11 +++++++++++
 cpupowerutils.spec |   18 ++++++++++++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/cpupower.config b/cpupower.config
new file mode 100644
index 0000000..9865c61
--- /dev/null
+++ b/cpupower.config
@@ -0,0 +1,2 @@
+CPUPOWER_START_OPTS="frequency-set -g performance"
+CPUPOWER_STOP_OPTS="frequency-set -g ondemand"
diff --git a/cpupower.service b/cpupower.service
new file mode 100644
index 0000000..dee5c65
--- /dev/null
+++ b/cpupower.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Configure CPU power related settings
+After=syslog.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cpupower ${CPUPOWER_START_OPTS}
+ExecStop=/usr/bin/cpupower ${CPUPOWER_STOP_OPTS}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/cpupowerutils.spec b/cpupowerutils.spec
index 2a6235b..33962fb 100644
--- a/cpupowerutils.spec
+++ b/cpupowerutils.spec
@@ -1,18 +1,21 @@
 Name:           cpupowerutils
 Version:        009
 # Prerelease 009p1
-Release:        0.4.p1%{?dist}
+Release:        0.5.p1%{?dist}
 Summary:        Tools to determine and set CPU power related settings
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://gitorious.org/%{name}
 # Source is just a git snapshot
 Source0:        %{name}-aa060434f2bc918e2091b302be9c6c5ea9410df5.tar.gz
+# systemd unit file and its configuration
+Source1:        cpupower.service
+Source2:        cpupower.config
 # Fails to build on x86
 Patch0:         cpupowerutils-009-disable-gsic.patch
 # Generate the same catalogues on all arches, please
 Patch1:         cpupowerutils-009-pot-creation-date.patch
-
+BuildRequires:  systemd-units
 BuildRequires:  libsysfs-devel
 BuildRequires:  pciutils-devel
 BuildRequires:  gettext
@@ -24,6 +27,8 @@ Provides:       cpufrequtils = 1:%{version}-%{release}
 Obsoletes:      cpufreq-utils < 1:%{version}-%{release}
 Obsoletes:      cpufrequtils < 1:%{version}-%{release}
 
+Obsoletes:      cpuspeed <= 1:1.5-15
+
 %description
 This tool is to make access to the Linux kernel's processor power subsystems
 like CPU frequency switching (cpufreq) or CPU sleep states (cpuidle) for users
@@ -69,6 +74,9 @@ rm -f %{buildroot}%{_libdir}/*.{a,la}
     install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
 %endif
 chmod 0755 %{buildroot}%{_libdir}/libcpufreq.so*
+mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
+install -m644 %{SOURCE1} %{buildroot}%{_unitdir}/cpupower.service
+install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
 
 %post -p /sbin/ldconfig
 
@@ -79,6 +87,8 @@ chmod 0755 %{buildroot}%{_libdir}/libcpufreq.so*
 %{_libdir}/libcpufreq.so.*
 %{_bindir}/*
 %{_mandir}/*/*
+%{_unitdir}/cpupower.service
+%config(noreplace) %{_sysconfdir}/sysconfig/cpupower
 
 %files devel
 %doc COPYING
@@ -86,6 +96,10 @@ chmod 0755 %{buildroot}%{_libdir}/libcpufreq.so*
 %{_includedir}/cpufreq.h
 
 %changelog
+* Fri Jul 08 2011 Petr Sabata <contyk at redhat.com> - 009-0.5.p1
+- Provide systemd unit files and its configuration
+- Obsolete cpuspeed (#713572)
+
 * Thu Jun 16 2011 Petr Sabata <contyk at redhat.com> - 009-0.4.p1
 - Include aa060434f2bc918e2091b302be9c6c5ea9410df5 (Make cpuidle kernel
   statistics 64 bit robust)