Update for tizen_2.1(package naming)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f1e7b0..b0c35c1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,14 +49,8 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/org.tizen.net-popup/bin)
 
 # install desktop file & icon
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/resources/net.netpopup.xml DESTINATION ${PREFIX}/share/packages/)
-
-
-# install ini file
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/${PROJECT_NAME}.ini DESTINATION share/process-info)
-
-ADD_SUBDIRECTORY(po)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/resources/org.tizen.net-popup.xml DESTINATION /usr/share/packages/)

diff --git a/debian/control b/debian/control
index 0bcc07e..a4aa45b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
 Source: net-popup
 Section: main
 Priority: extra
-Maintainer: Sanghoon Cho <sanghoon80.cho@samsung.com>, Danny Jeongseok Seo <s.seo@samsung.com>
-Uploaders: Sanghoon Cho <sanghoon80.cho@samsung.com>, Danny Jeongseok Seo <s.seo@samsung.com>
+Maintainer: Sunil Kim <sunil85.kim@samsung.com>, Sanghoon Cho <sanghoon80.cho@samsung.com>
+Uploaders: Sunil Kim <sunil85.kim@samsung.com>, Sanghoon Cho <sanghoon80.cho@samsung.com>
 Build-Depends: debhelper (>= 5),libevas-dev, libecore-dev, libethumb-dev, libelm-dev, libefreet-dev, libappcore-efl-dev, libdevman-dev, syspopup-dev, syspopup-caller-dev, dlog-dev
 Standards-Version: 0.1.0 
 
-Package: net.netpopup
+Package: org.tizen.net-popup
 Section: main
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libslp-utilx-0, libdlog-0
 Description: network system-popup application
 
-Package: net.netpopup-dbg
+Package: org.tizen.net-popup-dbg
 Section: debug
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

diff --git a/debian/net.netpopup.install.in b/debian/net.netpopup.install.in
index 42ba002..5e02569 100644 (file)
--- a/debian/net.netpopup.install.in
+++ b/debian/net.netpopup.install.in
@@ -2,4 +2,3 @@
 @PREFIX@/share/locale/*
 @PREFIX@/share/applications/net.netpopup.desktop
 @PREFIX@/share/process-info/net-popup.ini
-@PREFIX@/share/packages/net.netpopup.xml

diff --git a/debian/org.tizen.net-popup.install.in b/debian/org.tizen.net-popup.install.in
new file mode 100644 (file)
index 0000000..d643957
--- /dev/null
+++ b/debian/org.tizen.net-popup.install.in
@@ -0,0 +1,4 @@
+/opt/apps/org.tizen.net-popup/bin/net-popup
+/opt/share/icons/*
+/opt/share/process-info/net-popup.ini
+

diff --git a/debian/rules b/debian/rules
index 040ea38..26def98 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 CFLAGS ?= -Wall -g
 CXXFLAGS ?= -Wall -g
 LDFLAGS ?=
-PREFIX ?= /usr
+PREFIX ?= /opt/apps/org.tizen.net-popup
 DATADIR ?= /opt
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

diff --git a/net.netpopup.manifest b/net.netpopup.manifest
index 3100a71..cb463e5 100644 (file)
--- a/net.netpopup.manifest
+++ b/net.netpopup.manifest
@@ -1,10 +1,9 @@
 <manifest>
        <define>
-               <domain name="net.netpopup"/>
+               <domain name="org.tizen.net-popup"/>
        </define>
        <assign>
                <filesystem path="/usr/share/license/net.netpopup" label="_"/>
-               <filesystem path="/usr/share/packages/net.netpopup.xml" label="_"/>
                <filesystem path="/usr/share/process-info/net-popup.ini" label="_"/>
                <filesystem path="/usr/share/locale/ar/LC_MESSAGES/net-popup.mo" label="_"/>
                <filesystem path="/usr/share/locale/az/LC_MESSAGES/net-popup.mo" label="_"/>
@@ -59,6 +58,6 @@
                <filesystem path="/usr/share/locale/zh_TW/LC_MESSAGES/net-popup.mo" label="_"/>
        </assign>
        <request>
-               <domain name="net.netpopup"/>
+               <domain name="org.tizen.net-popup"/>
        </request>
 </manifest>

diff --git a/net.netpopup.rule b/net.netpopup.rule
deleted file mode 100644 (file)
index ba35ed3..0000000
--- a/net.netpopup.rule
+++ /dev/null
@@ -1,19 +0,0 @@
-e17 net.netpopup w
-net.netpopup xorg w
-net.netpopup isf rwx
-net.netpopup dbus rwx
-net.netpopup ail::db rw
-net.netpopup mdm-server w
-net.netpopup csc-manager x
-net.netpopup sound_server rw
-net.netpopup pulseaudio rwxat
-net.netpopup syspopup::db rw
-net.netpopup notification::db rw
-net.netpopup system::vconf rwxat
-net.netpopup system::media rwxat
-net.netpopup system::share rwxat
-net.netpopup device::app_logging w
-net.netpopup system::homedir rwxat
-net.netpopup sys-assert::core rwxat
-net.netpopup system::use_internet r
-com.samsung.app-tray net.netpopup rx

diff --git a/org.tizen.net-popup.manifest b/org.tizen.net-popup.manifest
new file mode 100644 (file)
index 0000000..41b6ed1
--- /dev/null
+++ b/org.tizen.net-popup.manifest
@@ -0,0 +1,12 @@
+<manifest>
+    <define>
+        <domain name="org.tizen.net-popup"/>
+    </define>
+    <assign>
+        <filesystem path="/usr/share/applications/org.tizen.net-popup.desktop" label="_"/>
+        <filesystem path="/opt/share/process-info/net-popup.ini" label="_"/>
+    </assign>
+    <request>
+        <domain name="org.tizen.net-popup"/>
+    </request>
+</manifest>

diff --git a/packaging/net.netpopup.spec b/packaging/org.tizen.net-popup.spec
similarity index 59%
rename from packaging/net.netpopup.spec
rename to packaging/org.tizen.net-popup.spec
index f817b6a..6b24d31 100644 (file)
--- a/packaging/net.netpopup.spec
+++ b/packaging/org.tizen.net-popup.spec
@@ -1,6 +1,9 @@
-Name:       net.netpopup
+%define _usrdir /usr
+%define _appdir %{_usrdir}/apps
+
+Name:       org.tizen.net-popup
 Summary:    Network Notification Popup application
-Version:    0.2.1_10
+Version:    0.2.01_3
 Release:    1
 Group:      App/Network
 License:    Flora License
@@ -29,27 +32,22 @@ Network Notification Popup application
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.net-popup
 
-make %{?_smp_mflags}
+make %{?jobs:-j%jobs}
 
 
 %install
 %make_install
 
-mkdir -p %{buildroot}%{_sysconfdir}/smack/accesses2.d/
-cp -v net.netpopup.rule %{buildroot}%{_sysconfdir}/smack/accesses2.d/
-
 #License
 mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE.Flora %{buildroot}%{_datadir}/license/net.netpopup
+cp LICENSE.Flora %{buildroot}%{_datadir}/license/org.tizen.net-popup
 
 
 %files
-%manifest net.netpopup.manifest
-%{_bindir}/net-popup
-%{_datadir}/process-info/net-popup.ini
-%{_datadir}/packages/net.netpopup.xml
-%{_datadir}/locale/*/LC_MESSAGES/net-popup.mo
-%{_datadir}/license/net.netpopup
-%{_sysconfdir}/smack/accesses2.d/net.netpopup.rule
+%manifest org.tizen.net-popup.manifest
+%defattr(-,root,root,-)
+%{_usrdir}/share/packages/org.tizen.net-popup.xml
+%{_appdir}/org.tizen.net-popup/bin/net-popup
+%{_datadir}/license/org.tizen.net-popup

diff --git a/resources/net.netpopup.xml b/resources/net.netpopup.xml
deleted file mode 100644 (file)
index fca4a68..0000000
--- a/resources/net.netpopup.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="net.netpopup" version="0.4.55-3" install-location="internal-only">
-       <label>Network popup</label>
-       <author email="sanghoon80.cho@samsung.com" href="www.samsung.com">Sanghoon Cho</author>
-       <description>Network popup</description>
-       <ui-application appid="net.netpopup" exec="/usr/bin/net-popup" nodisplay="true" multiple="false" type="capp" taskmanage="false">
-               <label>Network popup</label>
-       </ui-application>
-</manifest>

diff --git a/resources/org.tizen.net-popup.xml b/resources/org.tizen.net-popup.xml
new file mode 100644 (file)
index 0000000..ec3f093
--- /dev/null
+++ b/resources/org.tizen.net-popup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.net-popup" version="0.1.01-1" install-location="internal-only">
+       <label>Network popup</label>
+       <author email="sunil85.kim@samsung.com" href="https://www.tizen.org/">Sunil Kim</author>
+       <description>Network popup</description>
+       <ui-application appid="org.tizen.net-popup" exec="/usr/apps/org.tizen.net-popup/bin/net-popup" nodisplay="true" multiple="false" type="capp" taskmanage="false">
+               <label>Network popup</label>
+       </ui-application>
+</manifest>

diff --git a/src/net-popup.c b/src/net-popup.c
index cb76f44..ff0a7af 100644 (file)
--- a/src/net-popup.c
+++ b/src/net-popup.c
@@ -244,7 +244,7 @@ static void __net_popup_add_found_ap_noti(void)
        notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
        bundle *b = NULL;
 
-       notification_get_detail_list("net.netpopup", NOTIFICATION_GROUP_ID_NONE,
+       notification_get_detail_list("org.tizen.net-popup", NOTIFICATION_GROUP_ID_NONE,
                        NOTIFICATION_PRIV_ID_NONE, -1, &noti_list);
        if (noti_list != NULL) {
                notification_free_list(noti_list);
@@ -341,7 +341,7 @@ static void __net_popup_del_found_ap_noti(void)
 {
        notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
 
-       noti_err = notification_delete_all_by_type("net.netpopup",
+       noti_err = notification_delete_all_by_type("org.tizen.net-popup",
                        NOTIFICATION_TYPE_ONGOING);
        if (noti_err != NOTIFICATION_ERROR_NONE) {
                log_print(NET_POPUP, "fail to notification_delete_by_priv_id");
@@ -559,12 +559,12 @@ static void __net_popup_add_restricted_state_noti(bundle *b)
        text_cs = bundle_get_val(b, "_SYSPOPUP_NETWORK_NAME_");
        if (text_cs)
                __net_popup_add_restricted_state_noti_real (
-                               "net.netpopup.restricted_state_cs", text_cs);
+                               "org.tizen.net-popup.restricted_state_cs", text_cs);
 
        text_ps = bundle_get_val(b, "_SYSPOPUP_NETWORK_NAME2_");
        if (text_ps)
                __net_popup_add_restricted_state_noti_real (
-                               "net.netpopup.restricted_state_ps", text_ps);
+                               "org.tizen.net-popup.restricted_state_ps", text_ps);
 
        if (!text_cs && !text_ps)
                log_print(NET_POPUP, "failed, text_cs=%p, text_ps=%p",
@@ -575,14 +575,14 @@ static void __net_popup_del_restricted_state_noti(void)
 {
        notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
 
-       noti_err = notification_delete_all_by_type("net.netpopup.restricted_state_cs",
+       noti_err = notification_delete_all_by_type("org.tizen.net-popup.restricted_state_cs",
                        NOTIFICATION_TYPE_ONGOING);
        if (noti_err != NOTIFICATION_ERROR_NONE)
                log_print(NET_POPUP, "fail to notification_delete_by_priv_id");
        else
                log_print(NET_POPUP, "Successfully deleted cs notification");
 
-       noti_err = notification_delete_all_by_type("net.netpopup.restricted_state_ps",
+       noti_err = notification_delete_all_by_type("org.tizen.net-popup.restricted_state_ps",
                        NOTIFICATION_TYPE_ONGOING);
        if (noti_err != NOTIFICATION_ERROR_NONE)
                log_print(NET_POPUP, "fail to notification_delete_by_priv_id");