Remove initscripts and add PIDFile to service file

Also fix RPMLINT errors.

Change-Id: Id076e3dc83c4c4f9242fd5f427730a795e72cba4
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cd2f6c..92905c4 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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