Sync with tizen_2.2

Change-Id: Ic7a88df8ef2ddfbed46ef9392b1bcc5e959c60cc

diff --git a/osp-env-config.manifest b/osp-env-config.manifest
deleted file mode 100644 (file)
index ae3e6f7..0000000
--- a/osp-env-config.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>
\ No newline at end of file

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

diff --git a/packaging/osp-env-config.spec b/packaging/osp-env-config.spec
index d6b37b1..007b62d 100644 (file)
--- a/packaging/osp-env-config.spec
+++ b/packaging/osp-env-config.spec
@@ -5,6 +5,7 @@ Release:        2
 Group:         System/Libraries
 License:       Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
+Source1001:    osp-env-config.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(vconf)
@@ -25,6 +26,7 @@ osp application environment cofiguration serivce (devel)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
@@ -54,7 +56,7 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license
 %postun -p /sbin/ldconfig
 
 %files
-%manifest osp-env-config.manifest
+%manifest %{name}.manifest
 /usr/share/license/%{name}
 %{_libdir}/*.so*
 %{_libdir}/osp/libappinfo.so*