packaging: Drop duplicate manifest files

Change-Id: I930622898dde9566af7e0daed1ff3f4fd548bbf4

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

diff --git a/packaging/libdlog.manifest b/packaging/dlog.manifest
similarity index 100%
rename from packaging/libdlog.manifest
rename to packaging/dlog.manifest

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index a87f6a3..cf2a754 100644 (file)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -5,10 +5,7 @@ Release:    3
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source101:  packaging/dlogutil.manifest
-Source102:  packaging/libdlog.manifest
-Source103:  packaging/dlog-tests.manifest
-Source104:  packaging/dlogbackend-logger.manifest
+Source101:  packaging/dlog.manifest
 Source301:  packaging/dlog_logger.service
 Source302:  packaging/dlog_logger.path
 Source501:  packaging/01-dlog.rules
@@ -95,9 +92,6 @@ Integration tests for dlog.
 %build
 
 cp %{SOURCE101} .
-cp %{SOURCE102} .
-cp %{SOURCE103} .
-cp %{SOURCE104} .
 
 %autogen --disable-static
 %configure --disable-static \
@@ -169,13 +163,13 @@ rm %{TZ_SYS_ETC}/dlog.conf
 ln -s %{TZ_SYS_ETC}/dlog.conf.pipe %{TZ_SYS_ETC}/dlog.conf
 
 %files  -n dlogutil
-%manifest dlogutil.manifest
+%manifest dlog.manifest
 %license LICENSE.APACHE2.0
 %attr(750,log,log) %{_bindir}/dlogutil
 %attr(755,log,log) %{_bindir}/dlogsend
 
 %files  -n libdlog
-%manifest libdlog.manifest
+%manifest dlog.manifest
 %license LICENSE.APACHE2.0
 %{_libdir}/libdlog.so.0
 %{_libdir}/libdlog.so.0.0.0
@@ -192,26 +186,28 @@ ln -s %{TZ_SYS_ETC}/dlog.conf.pipe %{TZ_SYS_ETC}/dlog.conf
 %attr(644,log,log) %{TZ_SYS_ETC}/dlog.conf.d/
 
 %files -n libdlog-devel
+%manifest dlog.manifest
 %{_includedir}/dlog/dlog.h
 %{_includedir}/dlog/dlog-internal.h
 %{_libdir}/pkgconfig/dlog.pc
 %{_libdir}/libdlog.so
 
 %files -n dlogbackend-logger
-%manifest dlogbackend-logger.manifest
+%manifest dlog.manifest
 %license LICENSE.APACHE2.0
 %attr(664,log,log) %{TZ_SYS_ETC}/dlog.conf.logger
 
 %files -n log-syslog
-%manifest libdlog.manifest
+%manifest dlog.manifest
 %{_unitdir}/sockets.target.wants/dlog_dev-log.socket
 %{_unitdir}/dlog_dev-log.socket
 
 %files -n dlog-doc
+%manifest dlog.manifest
 /usr/share/doc/dlog
 
 %files -n dlog-tests
-%manifest dlog-tests.manifest
+%manifest dlog.manifest
 %{_bindir}/dlog_test_pipe
 %{_libexecdir}/libdlog/perf_libdlog
 %{_libexecdir}/libdlog/test_libdlog

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

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