Fix rpm manifest

Fix wrong usage of rpm manifest file.

Change-Id: I1dbbd870b758693069ed2f1c87cf60e72e0f19da
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 799d4fa4e4609558ebbb7a2083131de309c1bbf5..48417f0c7d3950918a4b339be9b184b5d75e2fad 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,6 @@ SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIC -fsta
 SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES LINK_FLAGS "-Wl,--as-needed,-z,relro")
 TARGET_LINK_LIBRARIES(${APP2EXT} ${app2ext_libpkgs_LDFLAGS})
 
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/app2sd.manifest.in ${CMAKE_BINARY_DIR}/app2sd.manifest @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/app2sd.pc.in ${CMAKE_BINARY_DIR}/app2sd.pc @ONLY)
 
 INSTALL(TARGETS ${APP2EXT} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)

diff --git a/app2sd.manifest.in b/app2sd.manifest.in
deleted file mode 100644 (file)
index 36ba1cf..0000000
--- a/app2sd.manifest.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-       <assign>
-               <filesystem path="/usr/bin/app2sd-server" exec_label="none"/>
-       </assign>
-</manifest>

diff --git a/packaging/app2sd-plugin.manifest b/packaging/app2sd-plugin.manifest
new file mode 100644 (file)
index 0000000..e5b4de8
--- /dev/null
+++ b/packaging/app2sd-plugin.manifest
@@ -0,0 +1,8 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+       <assign>
+               <filesystem path="/usr/bin/app2sd-server" label="System"/>
+       </assign>
+</manifest>

diff --git a/packaging/app2sd-test.manifest b/packaging/app2sd-test.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/packaging/app2sd-test.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/app2sd.manifest b/packaging/app2sd.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/packaging/app2sd.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/app2sd.spec b/packaging/app2sd.spec
index 0c59ba544f877319d6ecfc6070856abe8419bd51..6624de02e58bc2e2800a2b9049c55d26c472554f 100644 (file)
--- a/packaging/app2sd.spec
+++ b/packaging/app2sd.spec
@@ -5,6 +5,9 @@ Release:    1
 Group:      Application Framework/Package Management
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
+Source1:    %{name}.manifest
+Source2:    %{name}-test.manifest
+Source3:    %{name}-plugin.manifest
 
 BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(minizip)
@@ -48,6 +51,10 @@ app2sd server and plugin library
 %prep
 %setup -q
 
+cp %{SOURCE1} .
+cp %{SOURCE2} .
+cp %{SOURCE3} .
+
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DUNITDIR=%{_unitdir} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
@@ -75,10 +82,12 @@ rm -rf %{buildroot}
 %{_libdir}/libapp2ext.so
 
 %files test
+%manifest %{name}-test.manifest
 %defattr(-,root,root,-)
 %{_bindir}/test_app2ext
 
 %files plugin
+%manifest %{name}-plugin.manifest
 %{_libdir}/libapp2sd.so*
 %{_bindir}/app2sd-server
 %{_unitdir}/app2sd-server.service