Remove the extraneous manifests.

Change-Id: I08047aae085fa4a865e182fce1a51a1c30e6d94a

diff --git a/packaging/dlog.changes b/packaging/dlog.changes
index bb72c3e..1dc4eb1 100644 (file)
--- a/packaging/dlog.changes
+++ b/packaging/dlog.changes
@@ -1,3 +1,6 @@
+* Thu Jul 11 22:07:57 UTC 2013 - tracy.graydon@intel.com
+- Add a manifest to spec to fix a package build issue 
+
 * Wed Jun 19 2013 Baptiste DURAND <baptiste.durand@eurogiciel.fr> submit/tizen/20130527.020305@767017c
 - Fix Spec file and permission according to RPMLINT rules
 - Fix path for systemd services

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index 6267bad..ea0c435 100755 (executable)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -7,9 +7,8 @@ License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
 Source101:  dlog-main.service
 Source102:  dlog-radio.service
-Source103:  dlogutil.manifest
-Source104:  packaging/libdlog.manifest
-Source105:  tizen-debug-level.service
+Source103:  dlog.manifest
+Source104:  tizen-debug-level.service
 
 BuildRequires: pkgconfig(libsystemd-journal)
 Requires(post): /usr/bin/vconftool
@@ -46,9 +45,9 @@ Requires(preun): /usr/bin/systemctl
 Utilities for print log data
 
 
-
 %prep
 %setup -q
+cp %{SOURCE103} .
 
 
 %build
@@ -58,8 +57,6 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-cp %{SOURCE103} .
-cp %{SOURCE104} .
 %make_install
 mkdir -p %{buildroot}/opt/etc/dlog
 cp %{_builddir}/%{name}-%{version}/.dloglevel %{buildroot}/opt/etc/dlog/.dloglevel
@@ -77,7 +74,7 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 
 install -m 0644 %SOURCE101 %{buildroot}%{_unitdir}
 install -m 0644 %SOURCE102 %{buildroot}%{_unitdir}
-install -m 0644 %SOURCE105 %{buildroot}%{_unitdir}
+install -m 0644 %SOURCE104 %{buildroot}%{_unitdir}
 
 ln -s ../dlog-main.service %{buildroot}%{_unitdir}/multi-user.target.wants/dlog-main.service
 ln -s ../dlog-radio.service %{buildroot}%{_unitdir}/multi-user.target.wants/dlog-radio.service

diff --git a/packaging/dlogutil.manifest b/packaging/dlogutil.manifest
deleted file mode 100644 (file)
index bf95834..0000000
--- a/packaging/dlogutil.manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-<manifest>
-       <define>
-               <domain name="dlogutil"/>
-       <permit>
-               <smack permit="_" type="rx"/>
-       </permit>
-       </define>
-       <assign>
-               <filesystem path="/usr/bin/dlogutil" label="_" exec_label="none"/>
-               <filesystem path="/usr/bin/dlogctrl" label="_" exec_label="none"/>
-               <filesystem path="/etc/rc.d/init.d/dlog.sh" label="_" exec_label="none"/>
-               <filesystem path="/etc/rc.d/rc3.d/S05dlog" label="_" exec_label="none"/>
-               <filesystem path="/usr/lib/systemd/system/basic.target.wants/tizen-debug-level.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/dlog-main.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/dlog-radio.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/dlog-main.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/dlog-radio.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/tizen-debug-level.service" label="_" exec_label="none" />
-       </assign>
-       <request>
-               <domain name="dlogutil"/>
-       </request>
-</manifest>

diff --git a/packaging/libdlog.manifest b/packaging/libdlog.manifest
deleted file mode 100644 (file)
index 2292929..0000000
--- a/packaging/libdlog.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest>
-       <assign>
-               <filesystem path="/usr/lib/libdlog.so.0" label="_" exec_label="none"/>
-               <filesystem path="/usr/lib/libdlog.so.0.0" label="_" exec_label="none"/>
-       </assign>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>