packaging: Rename to hal-api-power-manifest.xml and change the install dir

In order to keep the consistent directory path of hal,
change the install directory path and then rename to
hal-api-power-manifest.xml which indicates HAL manifest file.

[Changed install path and file name]
- /etc/hal-manifest/hal-api-power.xml -> /etc/hal/hal-api-power-manifest.xml

Change-Id: I0b466c622d27b7398f1b43d03548d1d8801587e9
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cd7d8fe72411661f38e137d01b66155d6916d58..5658519d80393a14e3333576f0f2f46c66d46386 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,5 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
        FILES_MATCHING PATTERN "*.h")
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc
        DESTINATION ${LIBDIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/hal-api-power.xml
-       DESTINATION /etc/hal-manifest/)
 
 ADD_SUBDIRECTORY(tests)

diff --git a/packaging/hal-api-power-manifest.xml b/packaging/hal-api-power-manifest.xml
new file mode 100644 (file)
index 0000000..a369408
--- /dev/null
+++ b/packaging/hal-api-power-manifest.xml
@@ -0,0 +1,8 @@
+<hal-api>
+       <manifest platform-version="9.0">
+               <hal-module>
+                       <name>HAL_MODULE_POWER</name>
+                       <version>1.0</version>
+               </hal-module>
+       </manifest>
+</hal-api>

diff --git a/packaging/hal-api-power.spec b/packaging/hal-api-power.spec
index 395487579ff5678b1b1e1ddef5194b5b05d8fb71..bd9534e214e4da747a14466d0ce69f86829bafd8 100644 (file)
--- a/packaging/hal-api-power.spec
+++ b/packaging/hal-api-power.spec
@@ -11,6 +11,7 @@ Group:      Development/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
+Source2:    %{name}-manifest.xml
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -46,6 +47,8 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_sysconfdir}/hal
+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/hal/
 %make_install
 
 %clean
@@ -63,7 +66,7 @@ rm -rf %{buildroot}
 %license LICENSE
 %defattr(-,root,root,-)
 %{_libdir}/hal/*.so*
-%{_sysconfdir}/hal-manifest/hal-api-power.xml
+%{_sysconfdir}/hal/%{name}-manifest.xml
 
 %files -n %{devel_name}
 %defattr(-,root,root,-)

diff --git a/packaging/hal-api-power.xml b/packaging/hal-api-power.xml
deleted file mode 100644 (file)
index a369408..0000000
--- a/packaging/hal-api-power.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<hal-api>
-       <manifest platform-version="9.0">
-               <hal-module>
-                       <name>HAL_MODULE_POWER</name>
-                       <version>1.0</version>
-               </hal-module>
-       </manifest>
-</hal-api>