rename /usr/lib /usr/lib64 by using RPM macro and CMakeLists.txt

- remove settings.manifest
- rename smack lables '_'

Change-Id: I8b553dff119454a1171362e0f2da1603d00cb269
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dba96d9f0b5baeec45fccbfacef9c5ae4452b80f..4f2b22b596754c9313556fefca3ee1db6519989f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,10 @@ PROJECT(setting)
 SET(SETTING_PKG_NAME org.tizen.setting)
 
 SET(PREFIX "/usr/apps/org.tizen.setting")
+
+#SET(LIBDIR "${PREFIX}/lib")
+#SET(INCLUDEDIR "${PREFIX}/include")
+
 SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
 SET(DATADIR "${PREFIX}/data")

diff --git a/org.tizen.setting.manifest b/org.tizen.setting.manifest
index 90f7830fb77f12b92ae74069e3a5f8aef591e737..3b4b0a2eb890d6d0278fe2053b6df8e4cf2d5016 100644 (file)
--- a/org.tizen.setting.manifest
+++ b/org.tizen.setting.manifest
@@ -1,10 +1,6 @@
 <manifest>
        <define>
                <domain name="org.tizen.setting"/>
-               <provide>
-                       <label name="org.tizen.setting::default-resources"/>
-                       <label name="org.tizen.setting::private"/>
-               </provide>
                <request>
                        <smack request="pkgmgr::svc" type="rx"/>
                        <smack request="pkgmgr::info" type="r"/>
@@ -29,15 +25,15 @@
                <filesystem path="/usr/ug/lib/*" label="_"/>
                <filesystem path="/usr/ug/res/*" label="_"/>
 
-               <filesystem path="/opt/usr/apps/org.tizen.setting/data/langlist.xml" label="org.tizen.setting"/>
-               <filesystem path="/opt/usr/apps/org.tizen.setting/data/langlist_all.xml" label="org.tizen.setting"/>
-               <filesystem path="/opt/usr/apps/org.tizen.setting/data/test.db" label="org.tizen.setting"/>
-               <filesystem path="/opt/usr/apps/org.tizen.setting/data/*" label="org.tizen.setting"/>
+               <filesystem path="/opt/usr/apps/org.tizen.setting/data/langlist.xml" label="_"/>
+               <filesystem path="/opt/usr/apps/org.tizen.setting/data/langlist_all.xml" label="_"/>
+               <filesystem path="/opt/usr/apps/org.tizen.setting/data/test.db" label="_"/>
+               <filesystem path="/opt/usr/apps/org.tizen.setting/data/*" label="_"/>
 
                <filesystem path="/opt/usr/share/settings" label="_"/>
                <filesystem path="/opt/usr/share/settings/*" label="_"/>
-               <filesystem path="/usr/apps/org.tizen.setting/firewall" label="org.tizen.setting::firewall-security"/>
-               <filesystem path="/home/app/.firewall/*" label="org.tizen.setting::firewall-security"/>
+               <filesystem path="/usr/apps/org.tizen.setting/firewall" label="_"/>
+               <filesystem path="/home/app/.firewall/*" label="_"/>
 
                <filesystem path="/usr/ug/bin/*" label="_" exec_label="_"/>
 

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 2fc056d1d34032a2d2e9c9db743f7b4c3d12faa8..81fc4bff767379fcafe77842ff297556a54437bc 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -173,14 +173,14 @@ export CFLAGS="$CFLAGS -DTIZEN_BUILD_EMULATOR"
 %endif
 
 %ifarch %{arm}
-       cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=arm \
+       cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=arm -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
 %if %{with wayland} && !%{with x}
 -Dwith_wayland=TRUE
 %else
 -Dwith_x=TRUE
 %endif
 %else
-       cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=x86 \
+       cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=x86 -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
 %if %{with wayland} && !%{with x}
 -Dwith_wayland=TRUE
 %else

diff --git a/setting-applications/CMakeLists.txt b/setting-applications/CMakeLists.txt
index f3662f0c76bc8ee7dc3d567a805077f78b899488..ff8a5afeaa6849b2462e802ce4e54bd35e460ab1 100755 (executable)
--- a/setting-applications/CMakeLists.txt
+++ b/setting-applications/CMakeLists.txt
@@ -32,3 +32,4 @@ TARGET_LINK_LIBRARIES(${SETTING_APPLICATIONS_UG} -L${CMAKE_BINARY_DIR}/${SETTING
 TARGET_LINK_LIBRARIES(${SETTING_APPLICATIONS_UG} ${pkgs_display_LDFLAGS})
 
 INSTALL(TARGETS ${SETTING_APPLICATIONS_UG} DESTINATION ${PREFIX}/lib/ug)
+

diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt
index 67b3b13980fb5ee8bd954f7ef1b2ea9b888b21ca..b52bc9fefa181a8c442a4a425e8cce02289c18e6 100755 (executable)
--- a/setting-common/CMakeLists.txt
+++ b/setting-common/CMakeLists.txt
@@ -53,14 +53,14 @@ ADD_LIBRARY(${LIB_SETTING_COMMON} SHARED
 
 TARGET_LINK_LIBRARIES(${LIB_SETTING_COMMON} ${pkgs_common_data_LDFLAGS})
 SET_TARGET_PROPERTIES(${LIB_SETTING_COMMON} PROPERTIES VERSION 0.1.0 SOVERSION 1)
-INSTALL(TARGETS ${LIB_SETTING_COMMON} DESTINATION /usr/lib)
+INSTALL(TARGETS ${LIB_SETTING_COMMON} DESTINATION ${LIBDIR})
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-data-type.h DESTINATION /usr/include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-draw-widget.h DESTINATION /usr/include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-general-func.h DESTINATION /usr/include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-resource.h DESTINATION /usr/include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-cfg.h DESTINATION /usr/include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-data-edj-define.h DESTINATION /usr/include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-data-error.h DESTINATION /usr/include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-search.h DESTINATION /usr/include)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-data-type.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-draw-widget.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-general-func.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-resource.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-cfg.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-data-edj-define.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-data-error.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/setting-common-search.h DESTINATION ${INCLUDEDIR})
 

diff --git a/settings.manifest b/settings.manifest
deleted file mode 100644 (file)
index 8190ed2..0000000
--- a/settings.manifest
+++ /dev/null
@@ -1,30 +0,0 @@
-<manifest>
-  <define>
-    <domain name="org.tizen.setting"/>
-     <request>
-       <smack request="system::homedir" type="arwxt" />
-       <smack request="system::use_internet" type="r" />
-       <smack request="xorg" type="w" />
-       <smack request="system::vconf" type="arwxt" />
-       <smack request="ail::db" type="rw" />
-       <smack request="dbus" type="w" />
-       <smack request="ug_bluetooth" type="r" />
-       <smack request="isf" type="rwx" />
-       <smack request="pkgmgr" type="r" />
-       <smack request="media-data::db" type="rw" />
-       <smack request="worldclock::db" type="rw" />
-       <smack request="system::system_bklight" type="w" />
-       <smack request="efreet" type="rx" />
-       <smack request="contacts-service" type="rw" />
-       <smack request="contacts-service::db" type="rw" />
-       <smack request="msg-service" type="w" />
-       <smack request="location_fw::db" type="rw" />
-    </request>
-    <permit>
-        <smack permit="dbus" type="w" />
-    </permit>
-  </define>
-  <request>
-    <domain name="org.tizen.setting"/>
-  </request>
-</manifest>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1c929ecf9d9536b1cc1d49709bbcab9d6ad6b486..cd633639bfa42b1ee3085ee625d1f9c1b535b576 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,8 +81,6 @@ INSTALL(TARGETS ${SETTING_CONFUTIL} DESTINATION /usr/apps/${SETTING_PKG_NAME}/bi
 
 ####FOR TEST>>>>########
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
-#TARGET_LINK_LIBRARIES(${PROJECT_NAME} -L/usr/apps/${SETTING_PKG_NAME}/lib -lsetting-common)
-# /usr/apps/${SETTING_PKG_NAME}/lib
 
 
 # util to turn off assistive light
@@ -284,7 +282,7 @@ CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/setting-common-internal.pc
     @ONLY
 )
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/setting-common-internal.pc DESTINATION /usr/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/setting-common-internal.pc DESTINATION ${LIBDIR}/pkgconfig)
 #-----------------------------------------------------------------------------------
 
 # install firewall script for FOTA(210.org.tizen.setting.patch.sh)