Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/livebox...

diff --git a/liblivebox-cpp.manifest b/liblivebox-cpp.manifest
deleted file mode 100644 (file)
index a76fdba..0000000
--- a/liblivebox-cpp.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-</manifest>

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

diff --git a/packaging/liblivebox-cpp.spec b/packaging/liblivebox-cpp.spec
index 238a233..4623b63 100644 (file)
--- a/packaging/liblivebox-cpp.spec
+++ b/packaging/liblivebox-cpp.spec
@@ -5,6 +5,7 @@ Release: 1
 Group: HomeTF/Livebox
 License: Flora License
 Source0: %{name}-%{version}.tar.gz
+Source1001:    liblivebox-cpp.manifest
 BuildRequires: cmake, gettext-tools, coreutils
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(livebox)
@@ -24,6 +25,7 @@ Livebox development library (C++) (dev)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %if 0%{?tizen_build_binary_release_type_eng}
@@ -42,12 +44,13 @@ mkdir -p %{buildroot}/%{_datarootdir}/license
 %post
 
 %files -n liblivebox-cpp
-%manifest liblivebox-cpp.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/*.so*
 %{_datarootdir}/license/*
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/livebox-cpp/livebox-cpp.h
 %{_datarootdir}/doc/livebox-cpp/livebox-cpp_PG.h