- convert libx11 to virtual/libx11.

diff --git a/meta-wrt-tizen/recipes-wrt/app-core/app-core-depends.inc b/meta-wrt-tizen/recipes-wrt/app-core/app-core-depends.inc
index ae07aa2..69dd757 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/app-core/app-core-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/app-core/app-core-depends.inc
@@ -3,9 +3,9 @@ DEPENDS = ""
 DEPENDS += "aul-1"
 inherit tizen_cmake
 DEPENDS += "librua"
-DEPENDS += "libx11"
 DEPENDS += "dlog"
 DEPENDS += "glib-2.0"
+DEPENDS += "virtual/libx11"
 DEPENDS += "elementary"
 DEPENDS += "ecore"
 DEPENDS += "sensor"

diff --git a/meta-wrt-tizen/recipes-wrt/app-svc/app-svc-depends.inc b/meta-wrt-tizen/recipes-wrt/app-svc/app-svc-depends.inc
index 7a5974e..d7c71de 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/app-svc/app-svc-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/app-svc/app-svc-depends.inc
@@ -4,13 +4,13 @@ DEPENDS += "pkgmgr-info"
 DEPENDS += "aul-1"
 inherit tizen_cmake
 DEPENDS += "iniparser"
-DEPENDS += "libx11"
+DEPENDS += "libsoup-2.4"
 DEPENDS += "dlog"
 DEPENDS += "glib-2.0"
 DEPENDS += "xdgmime"
 DEPENDS += "ail"
 DEPENDS += "bundle"
-DEPENDS += "libsoup-2.4"
+DEPENDS += "virtual/libx11"
 DEPENDS += "sqlite3"
 DEPENDS += "ecore"
 DEPENDS += "libprivilege-control"

diff --git a/meta-wrt-tizen/recipes-wrt/aul-1/aul-1-depends.inc b/meta-wrt-tizen/recipes-wrt/aul-1/aul-1-depends.inc
index 31d1975..5bc1a69 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/aul-1/aul-1-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/aul-1/aul-1-depends.inc
@@ -4,12 +4,12 @@ DEPENDS += "pkgmgr-info"
 DEPENDS += "librua"
 inherit tizen_cmake
 DEPENDS += "app2sd"
-DEPENDS += "libx11"
 DEPENDS += "bundle"
 DEPENDS += "xdgmime"
 DEPENDS += "ail"
 DEPENDS += "smack"
 DEPENDS += "dlog"
+DEPENDS += "virtual/libx11"
 DEPENDS += "sqlite3"
 DEPENDS += "ecore"
 DEPENDS += "libprivilege-control"

diff --git a/meta-wrt-tizen/recipes-wrt/bluetooth-tools/bluetooth-tools-native_git.bb b/meta-wrt-tizen/recipes-wrt/bluetooth-tools/bluetooth-tools-native_git.bb
index a05f3d8..953379e 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/bluetooth-tools/bluetooth-tools-native_git.bb
+++ b/meta-wrt-tizen/recipes-wrt/bluetooth-tools/bluetooth-tools-native_git.bb
@@ -8,6 +8,6 @@ S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/connectivity/bluetooth-tools;protocol=ssh;tag=submit/tizen/20130813.173210"
+SRC_URI += "git://review.tizen.org/platform/core/connectivity/bluetooth-tools;protocol=ssh;tag=submit/tizen/20130909.103211"
 require bluetooth-tools-native-extraconf.inc
 

diff --git a/meta-wrt-tizen/recipes-wrt/bluetooth-tools/bluetooth-tools_git.bb b/meta-wrt-tizen/recipes-wrt/bluetooth-tools/bluetooth-tools_git.bb
index 036571c..865069c 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/bluetooth-tools/bluetooth-tools_git.bb
+++ b/meta-wrt-tizen/recipes-wrt/bluetooth-tools/bluetooth-tools_git.bb
@@ -5,6 +5,6 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/connectivity/bluetooth-tools;protocol=ssh;tag=submit/tizen/20130813.173210"
+SRC_URI += "git://review.tizen.org/platform/core/connectivity/bluetooth-tools;protocol=ssh;tag=submit/tizen/20130909.103211"
 require bluetooth-tools-oe-extraconf.inc
 

diff --git a/meta-wrt-tizen/recipes-wrt/com-core/com-core-native_git.bb b/meta-wrt-tizen/recipes-wrt/com-core/com-core-native_git.bb
index 9dda8a0..a9fd58d 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/com-core/com-core-native_git.bb
+++ b/meta-wrt-tizen/recipes-wrt/com-core/com-core-native_git.bb
@@ -8,6 +8,6 @@ S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/appfw/com-core;protocol=ssh;tag=submit/tizen/20130710.102905"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/com-core;protocol=ssh;tag=submit/tizen/20130909.202456"
 require com-core-native-extraconf.inc
 

diff --git a/meta-wrt-tizen/recipes-wrt/com-core/com-core_git.bb b/meta-wrt-tizen/recipes-wrt/com-core/com-core_git.bb
index 06cf082..7107166 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/com-core/com-core_git.bb
+++ b/meta-wrt-tizen/recipes-wrt/com-core/com-core_git.bb
@@ -5,6 +5,6 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/appfw/com-core;protocol=ssh;tag=submit/tizen/20130710.102905"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/com-core;protocol=ssh;tag=submit/tizen/20130909.202456"
 require com-core-oe-extraconf.inc
 

diff --git a/meta-wrt-tizen/recipes-wrt/libdri2/libdri2-depends.inc b/meta-wrt-tizen/recipes-wrt/libdri2/libdri2-depends.inc
index 18cb795..679caf5 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/libdri2/libdri2-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/libdri2/libdri2-depends.inc
@@ -1,6 +1,6 @@
 DEPENDS = ""
 #DEPENDS of libdri2 
-DEPENDS += "libx11"
 DEPENDS += "libxext"
-DEPENDS += "dri2proto"
 DEPENDS += "libxfixes"
+DEPENDS += "dri2proto"
+DEPENDS += "virtual/libx11"

diff --git a/meta-wrt-tizen/recipes-wrt/libslp-utilx/libslp-utilx-depends.inc b/meta-wrt-tizen/recipes-wrt/libslp-utilx/libslp-utilx-depends.inc
index c9c3086..6e4eb19 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/libslp-utilx/libslp-utilx-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/libslp-utilx/libslp-utilx-depends.inc
@@ -2,11 +2,11 @@ DEPENDS = ""
 #DEPENDS of libslp-utilx 
 inherit tizen_cmake
 DEPENDS += "libdri2"
-DEPENDS += "libx11"
+DEPENDS += "dri2proto"
 DEPENDS += "libtbm"
-DEPENDS += "libxv"
 DEPENDS += "libdrm"
-DEPENDS += "dri2proto"
+DEPENDS += "libxv"
+DEPENDS += "virtual/libx11"
 DEPENDS += "libxdamage"
 DEPENDS += "libxext"
 DEPENDS += "libxrandr"

diff --git a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager-native_git.bb b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager-native_git.bb
index 766fc03..f684cdc 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager-native_git.bb
+++ b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager-native_git.bb
@@ -8,6 +8,6 @@ S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/security/privacy-manager;protocol=ssh;tag=submit/tizen/20130716.223251"
+SRC_URI += "git://review.tizen.org/platform/core/security/privacy-manager;protocol=ssh;tag=submit/tizen/20130909.074254"
 require privacy-manager-native-extraconf.inc
 

diff --git a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager.inc b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager.inc
index 0b8214c..a2f78cc 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager.inc
+++ b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager.inc
@@ -22,7 +22,7 @@ privacy-manager-client_files += "/etc/package-manager/parserlib/libprivileges.so
 privacy-manager-server_files = ""
 privacy-manager-server_files += "packaging/privacy-manager-server.manifest"
 privacy-manager-server_files += "/usr/bin/*"
-privacy-manager-server_files += "/usr/lib/systemd/*"
+privacy-manager-server_files += "/lib/systemd/system/*"
 privacy-manager-server_files += "/opt/dbspace/.privacylist.db"
 
 capi-security-privacy-manager-devel_files = ""

diff --git a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager_git.bb b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager_git.bb
index 7ddb8b9..f80a5fb 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager_git.bb
+++ b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager_git.bb
@@ -5,6 +5,6 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/security/privacy-manager;protocol=ssh;tag=submit/tizen/20130716.223251"
+SRC_URI += "git://review.tizen.org/platform/core/security/privacy-manager;protocol=ssh;tag=submit/tizen/20130909.074254"
 require privacy-manager-oe-extraconf.inc
 

diff --git a/meta-wrt-tizen/recipes-wrt/syspopup/syspopup-depends.inc b/meta-wrt-tizen/recipes-wrt/syspopup/syspopup-depends.inc
index a684eaa..61f2c06 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/syspopup/syspopup-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/syspopup/syspopup-depends.inc
@@ -3,10 +3,10 @@ DEPENDS = ""
 DEPENDS += "aul-1"
 inherit tizen_cmake
 DEPENDS += "evas"
-DEPENDS += "libx11"
 DEPENDS += "dlog"
 DEPENDS += "app-core"
 DEPENDS += "bundle"
+DEPENDS += "virtual/libx11"
 DEPENDS += "sqlite3"
 DEPENDS += "dbus-glib"
 DEPENDS += "libslp-utilx"

diff --git a/meta-wrt-tizen/recipes-wrt/system-info/system-info-depends.inc b/meta-wrt-tizen/recipes-wrt/system-info/system-info-depends.inc
index a9de47c..c30814e 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/system-info/system-info-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/system-info/system-info-depends.inc
@@ -5,15 +5,15 @@ DEPENDS += "libhaptic"
 DEPENDS += "libslp-tapi"
 inherit tizen_cmake
 DEPENDS += "libslp-location"
+DEPENDS += "libxml2"
 DEPENDS += "libxi"
 DEPENDS += "libmm-radio"
-DEPENDS += "libx11"
 DEPENDS += "xproto"
 DEPENDS += "openssl"
 DEPENDS += "dlog"
 DEPENDS += "libxrandr"
 DEPENDS += "common"
-DEPENDS += "libxml2"
+DEPENDS += "virtual/libx11"
 DEPENDS += "sound-manager"
 DEPENDS += "sensor"
 DEPENDS += "vconf"

diff --git a/meta-wrt-tizen/recipes-wrt/ui-gadget-1/ui-gadget-1-depends.inc b/meta-wrt-tizen/recipes-wrt/ui-gadget-1/ui-gadget-1-depends.inc
index 2ace069..907d08d 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/ui-gadget-1/ui-gadget-1-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/ui-gadget-1/ui-gadget-1-depends.inc
@@ -1,13 +1,13 @@
 DEPENDS = ""
 #DEPENDS of ui-gadget-1 
 DEPENDS += "edje"
-DEPENDS += "app-svc"
 inherit tizen_cmake
-DEPENDS += "libx11"
+DEPENDS += "app-svc"
 DEPENDS += "dlog"
 DEPENDS += "glib-2.0"
 DEPENDS += "application"
 DEPENDS += "bundle"
+DEPENDS += "virtual/libx11"
 DEPENDS += "app-manager"
 DEPENDS += "runtime-info"
 DEPENDS += "app-core"

diff --git a/meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc b/meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc
index 7a8a2ed..ad2b91d 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc
+++ b/meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc
@@ -28,6 +28,7 @@ DEPENDS += "bundle"
 DEPENDS += "sqlite3"
 DEPENDS += "smack"
 DEPENDS += "webkit-efl"
+DEPENDS += "virtual/libx11"
 DEPENDS += "ecore"
 DEPENDS += "mesa"
 DEPENDS += "app-core"
@@ -35,7 +36,6 @@ DEPENDS += "app-checker"
 DEPENDS += "libslp-utilx"
 DEPENDS += "wrt-plugins-common"
 DEPENDS += "url-download"
-DEPENDS += "libx11"
 DEPENDS += "openssl"
 DEPENDS += "app2sd"
 DEPENDS += "wrt-commons"

diff --git a/proto-meta-Tizen_ivi_3.0/.spec2yoctorc b/proto-meta-Tizen_ivi_3.0/.spec2yoctorc
index 65c5125..bb779b2 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/.spec2yoctorc
+++ b/proto-meta-Tizen_ivi_3.0/.spec2yoctorc
@@ -341,7 +341,7 @@ mesa=pkgconfig(gl), pkgconfig(glesv2), pkgconfig(egl), pkgconfig(wayland-egl), p
 dbus-glib=pkgconfig(dbus-glib-1)
 smack=pkgconfig(libsmack)
 sqlite3=pkgconfig(sqlite3)
-libx11=pkgconfig(x11)
+virtual/libx11=pkgconfig(x11)
 aul-1=pkgconfig(aul)
 wrt-plugins-common=pkgconfig(wrt-plugin-js-overlay), pkgconfig(wrt-plugin-loading), pkgconfig(wrt-plugins-api-support), pkgconfig(wrt-plugins-commons), pkgconfig(wrt-plugins-commons-javascript), pkgconfig(wrt-plugins-filesystem), pkgconfig(wrt-plugins-ipc-message), pkgconfig(wrt-plugins-plugin-manager), pkgconfig(wrt-plugins-widget-interface-dao), pkgconfig(wrt-plugins-widgetdb), pkgconfig(wrt-popup-ace-runner), pkgconfig(wrt-popup-runner), pkgconfig(wrt-popup-wrt-runner)
 wrt-commons=pkgconfig(dpl-db-efl), pkgconfig(dpl-dbus-efl), pkgconfig(dpl-efl), pkgconfig(dpl-encryption), pkgconfig(dpl-event-efl), pkgconfig(dpl-popup-efl), pkgconfig(dpl-rpc-efl), pkgconfig(dpl-socket-efl), pkgconfig(dpl-test-efl), pkgconfig(dpl-utils-efl), pkgconfig(dpl-wrt-dao-ro), pkgconfig(dpl-wrt-dao-rw), pkgconfig(wrt-commons-auto-save-dao), pkgconfig(wrt-commons-auto-save-dao-ro), pkgconfig(wrt-commons-auto-save-dao-rw), pkgconfig(wrt-plugins-types)

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-initial/privacy-manager/packaging/privacy-manager.spec b/proto-meta-Tizen_ivi_3.0/specfile-initial/privacy-manager/packaging/privacy-manager.spec
index fcded9b..6381710 100755 (executable)
--- a/proto-meta-Tizen_ivi_3.0/specfile-initial/privacy-manager/packaging/privacy-manager.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-initial/privacy-manager/packaging/privacy-manager.spec
@@ -1,35 +1,28 @@
-Name:    privacy-manager-server
-Summary: Privacy Management
-Version: 0.0.3
-Release: 1
-Group:   Security/Libraries
-License: Apache-2.0
-Source0: %{name}-%{version}.tar.gz
-Source1: privacy-manager-server.service
-BuildRequires: cmake
+Name:           privacy-manager-server
+Version:        0.0.4
+Release:        0
+License:        Apache-2.0
+Summary:        Privacy Management
+Group:          Security/Libraries
+Source0:        %{name}-%{version}.tar.gz
+Source1:        privacy-manager-server.service
+Source1001:     privacy-manager-server.manifest
+Source1002:     privacy-manager-server-devel.manifest
+Source1003:     privacy-manager-client.manifest
+Source1004:     privacy-manager-client-devel.manifest
+Source1005:     capi-security-privacy-manager.manifest
+Source1006:     capi-security-privacy-manager-devel.manifest
+BuildRequires:  cmake
+BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(capi-base-common)
-BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(sqlite3)
-BuildRequires: pkgconfig(capi-base-common)
-BuildRequires: pkgconfig(dbus-1)
-BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(db-util)
-BuildRequires: pkgconfig(pkgmgr-info)
-BuildRequires: gettext-tools
-BuildRequires: edje-tools
-BuildRequires: pkgconfig(aul)
-BuildRequires: pkgconfig(ail)
-BuildRequires: pkgconfig(appcore-efl)
-BuildRequires: pkgconfig(capi-appfw-application)
-BuildRequires: pkgconfig(edje)
-BuildRequires: pkgconfig(eina)
-BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(ui-gadget-1)
-BuildRequires: pkgconfig(icu-i18n)
-BuildRequires: pkgconfig(bundle)
+BuildRequires:  pkgconfig(db-util)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(pkgmgr-info)
+BuildRequires:  pkgconfig(sqlite3)
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -38,80 +31,75 @@ Requires(postun): /sbin/ldconfig
 Privacy Management
 
 %package -n privacy-manager-server-devel
-Summary: privacy-manager server
-Group: Development/Libraries
-Requires: privacy-manager-server = %{version}-%{release}
+Summary:        Privacy Manager Server
+Requires:       privacy-manager-server = %{version}
 
 %description -n privacy-manager-server-devel
 privacy-manager server devel
 
 %package -n privacy-manager-client
-Summary: privacy-manager client
-Group: System/Libraries
-Requires: privacy-manager-server = %{version}-%{release}
+Summary:        Privacy Manager client
+Requires:       privacy-manager-server = %{version}
 
 %description -n privacy-manager-client
 privacy-manager client
 
 %package -n privacy-manager-client-devel
-Summary:    privacy-manager client devel
-Group:      Development/Libraries
-Requires:   privacy-manager-client = %{version}-%{release}
+Summary:        Privacy Manager client devel
+Requires:       privacy-manager-client = %{version}
 
 %description -n privacy-manager-client-devel
 Privacy Management(development files)
 
 %package -n capi-security-privacy-manager
-Summary:    Privacy Manager API
-Group:      API/C API
-License:    Apache-2.0
-Requires: privacy-manager-client = %{version}-%{release}
+Summary:        Privacy Manager API
+Requires:       privacy-manager-client = %{version}
 
 %description -n capi-security-privacy-manager
-The Privacy Manager API provides functions to get/set information about privacy information of installed packages.
+The Privacy Manager API provides functions to get/set information 
+about privacy information of installed packages.
 
 %package  -n capi-security-privacy-manager-devel
-Summary:  Privacy Manager API (Development)
-Group:    API/C API
-Requires: capi-security-privacy-manager = %{version}-%{release}
+Summary:        Privacy Manager API (Development)
+Requires:       capi-security-privacy-manager = %{version}
 
 %description -n capi-security-privacy-manager-devel
-The Privacy Manager API provides functions to get/set information about privacy information of installed packages.(DEV)
-
-%package -n tizenprv00.privacy-popup
-Summary:  Privacy Popup
-Group:    System/Security
-
-%description -n tizenprv00.privacy-popup
-The Privacy popup provides UI to set privacy information of application.
+The Privacy Manager API provides functions to get/set 
+information about privacy information of installed packages.(DEV)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
+cp %{SOURCE1002} .
+cp %{SOURCE1003} .
+cp %{SOURCE1004} .
+cp %{SOURCE1005} .
+cp %{SOURCE1006} .
 
 %build
-#%{!?build_type:%define build_type "Release"}
-
+%{!?build_type:%define build_type "Release"}
 %cmake . -DPREFIX=%{_prefix} \
         -DEXEC_PREFIX=%{_exec_prefix} \
         -DLIBDIR=%{_libdir} \
         -DINCLUDEDIR=%{_includedir} \
         -DCMAKE_BUILD_TYPE=%{build_type} \
         -DVERSION=%{version} \
-        -DDPL_LOG="ON" 
-make %{?jobs:-j%jobs}
+        -DFILTER_LISTED_PKG=ON
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/bin
-cp res/usr/bin/* %{buildroot}/usr/bin/
+mkdir -p %{buildroot}%{_prefix}/bin
+cp res/usr/bin/* %{buildroot}%{_bindir}/
 mkdir -p %{buildroot}/opt/dbspace
 cp res/opt/dbspace/.privacylist.db /%{buildroot}/opt/dbspace/
+mkdir -p %{buildroot}%{_datadir}/privacy-manager/
+cp res/usr/share/privacy-manager/privacy-filter-list.ini %{buildroot}%{_datadir}/privacy-manager/
 
 %make_install
 
-mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/privacy-manager-server.service
-ln -sf %{_unitdir}/privacy-manager-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/privacy-manager-server.service
+mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+#install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/privacy-manager-server.service
+#ln -sf /usr/lib/systemd/system/privacy-manager-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/privacy-manager-server.service
 
 
 %post -n privacy-manager-server
@@ -135,44 +123,39 @@ fi
 %postun -n capi-security-privacy-manager -p /sbin/ldconfig
 
 %files -n privacy-manager-server
-%license  LICENSE.APLv2
 %defattr(-,root,root,-)
-%manifest packaging/privacy-manager-server.manifest
-%{_bindir}/*
-%{_prefix}/lib/systemd/*
+%license  LICENSE.APLv2
+%manifest privacy-manager-server.manifest
+%{_libdir}/libprivacy-manager-server.so*
 /opt/dbspace/.privacylist.db
+/usr/bin/*
 
 %files -n privacy-manager-server-devel
+%{_includedir}/privacy_manager/server/privacy_manager_daemon.h
 %{_libdir}/pkgconfig/privacy-manager-server.pc
 
 %files -n privacy-manager-client
-%license  LICENSE.APLv2
 %defattr(-,root,root,-)
-%manifest packaging/privacy-manager-client.manifest
+%license  LICENSE.APLv2
+%manifest privacy-manager-client.manifest
 %{_libdir}/libprivacy-manager-client.so*
-/etc/package-manager/parserlib/libprivileges.so
+%{_datadir}/privacy-manager/privacy-filter-list.ini
+%{_sysconfdir}/package-manager/parserlib/libprivileges.so
 
 %files -n privacy-manager-client-devel
 %defattr(-,root,root,-)
+%manifest privacy-manager-client-devel.manifest
 %{_includedir}/*
 %{_libdir}/pkgconfig/privacy-manager-client.pc
 
 
-
 %files -n capi-security-privacy-manager
 %license  LICENSE.APLv2
 %{_libdir}/libcapi-security-privacy-manager.so.*
-%manifest packaging/capi-security-privacy-manager.manifest
+%manifest capi-security-privacy-manager.manifest
 
 %files -n capi-security-privacy-manager-devel
+%manifest capi-security-privacy-manager-devel.manifest
 %{_includedir}/privacymgr/*.h
 %{_libdir}/libcapi-security-privacy-manager.so
 %{_libdir}/pkgconfig/capi-security-privacy-manager.pc
-
-%files -n tizenprv00.privacy-popup
-%license  LICENSE.APLv2
-%manifest packaging/tizenprv00.privacy-popup.manifest
-%defattr(-,root,root,-)
-/usr/bin/tizenprv00.privacy-popup
-/usr/share/packages/tizenprv00.privacy-popup.xml
-#/etc/smack/accesses2.d/tizenprv00.privacy-popup.rule

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/privacy-manager.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/privacy-manager.spec.patch
deleted file mode 100644 (file)
index ba9416e..0000000
--- a/proto-meta-Tizen_ivi_3.0/specfile-patch/privacy-manager.spec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
-index fcded9b..75a1c93 100755
---- a/packaging/privacy-manager.spec
-+++ b/packaging/privacy-manager.spec
-@@ -139,7 +139,7 @@ fi
- %defattr(-,root,root,-)
- %manifest packaging/privacy-manager-server.manifest
- %{_bindir}/*
--%{_prefix}/lib/systemd/*
-+%{_unitdir}/*
- /opt/dbspace/.privacylist.db
- 
- %files -n privacy-manager-server-devel