summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Wereski <m.wereski@partner.samsung.com>2013-12-09 11:30:28 +0100
committerMaciej Wereski <m.wereski@partner.samsung.com>2013-12-09 11:49:15 +0100
commit9acc07812294b63e060ae1b44b34df118b6e304d (patch)
tree0834a8ad906d0e39d19ef36e060426ae76923aae
parenta4c48d76362ca6751ed77fb20b938e1621c0200a (diff)
downloadpower-manager-accepted/tizen_3.0.m14.3_ivi.tar.gz
power-manager-accepted/tizen_3.0.m14.3_ivi.tar.bz2
power-manager-accepted/tizen_3.0.m14.3_ivi.zip
Also fix RPMLINT errors. Change-Id: Id076e3dc83c4c4f9242fd5f427730a795e72cba4 Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
-rw-r--r--CMakeLists.txt1
-rw-r--r--packaging/power-manager.service1
-rw-r--r--packaging/power-manager.spec12
3 files changed, 3 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cd2f6c..92905c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,5 @@ CONFIGURE_FILE(${UDEV_RULES}.in ${UDEV_RULES} @ONLY)
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/pmctrl DESTINATION bin)
INSTALL(FILES ${UDEV_RULES} DESTINATION ${UDEV_RULES_PATH})
-INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/pmctrl DESTINATION /etc/rc.d/init.d)
ADD_SUBDIRECTORY(pm_event)
diff --git a/packaging/power-manager.service b/packaging/power-manager.service
index 13609c8..9205295 100644
--- a/packaging/power-manager.service
+++ b/packaging/power-manager.service
@@ -5,6 +5,7 @@ Description=Start the power manager service
Type=forking
ExecStart=/usr/bin/pmctrl start
Environment=DISPLAY=:0
+PIDFile=/var/run/power-manager.pid
[Install]
WantedBy=multi-user.target
diff --git a/packaging/power-manager.spec b/packaging/power-manager.spec
index dfa5220..1746074 100644
--- a/packaging/power-manager.spec
+++ b/packaging/power-manager.spec
@@ -2,8 +2,8 @@ Name: power-manager
Summary: Power manager
Version: 1.3.23
Release: 9
-Group: framework/system
-License: APLv2
+Group: System/Power Management
+License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
Source1001: power-manager.manifest
Requires(post): /usr/bin/vconftool
@@ -51,11 +51,6 @@ mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
install -m 0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/power-manager.service
ln -s ../power-manager.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/power-manager.service
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/
-ln -s %{_sysconfdir}/init.d/pmctrl %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S35power-manager
-ln -s %{_sysconfdir}/init.d/pmctrl %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S00power-manager
-
%post
vconftool set -t int memory/pm/state 0 -i
vconftool set -t int memory/pm/battery_timetofull -1 -i
@@ -76,9 +71,6 @@ fi
%files
%manifest %{name}.manifest
%license LICENSE.APLv2
-%{_sysconfdir}/rc.d/init.d/pmctrl
-%{_sysconfdir}/rc.d/rc3.d/S35power-manager
-%{_sysconfdir}/rc.d/rc5.d/S00power-manager
%{_bindir}/pm_event
%{_bindir}/pmctrl
%{_bindir}/power_manager