From: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>
Date: Fri, 2 Jan 2015 09:50:04 +0000 (+0100)
Subject: packaging: do not install files overlapping Weston's ones
X-Git-Tag: accepted/tizen/ivi/20150112.234132^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14fc2c42d78f2f51c743272a739ceedb510f8c24;hp=48b57036d720d76dcc06ce322187d2b3e11a9c76;p=profile%2Fivi%2Fweston-ivi-shell.git

packaging: do not install files overlapping Weston's ones

weston-ivi-shell installs .png files in /usr/share/weston,
including some already provided by the depending "weston"
package. This is bad practice and functionally unneeded.
Remove these files from the installation step.

Change-Id: I75d169331764afb4d5341f7091f9096522e0158c
Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>
---

diff --git a/packaging/weston-ivi-shell.spec b/packaging/weston-ivi-shell.spec
index 1dedb71..60dfa0d 100644
--- a/packaging/weston-ivi-shell.spec
+++ b/packaging/weston-ivi-shell.spec
@@ -125,7 +125,6 @@ install -m 644 protocol/*.c \
 mkdir -p %{buildroot}%{weston_config_dir}
 install -m 0644 %{SOURCE1} %{buildroot}%{weston_config_dir}
 install -d %{buildroot}/%{_datadir}/weston/
-cp -rfva data/* %{buildroot}/%{_datadir}/weston/
 
 %define _unpackaged_files_terminate_build 0
 
@@ -142,6 +141,16 @@ cp -rfva data/* %{buildroot}/%{_datadir}/weston/
 
 %exclude %_bindir/weston
 %exclude %_libdir/weston/desktop-shell.so
+# exclude png files installed by the weston package
+%exclude %_datadir/weston/wayland.svg
+%exclude %_datadir/weston/wayland.png
+%exclude %_datadir/weston/pattern.png
+%exclude %_datadir/weston/terminal.png
+%exclude %_datadir/weston/border.png
+%exclude %_datadir/weston/icon_window.png
+%exclude %_datadir/weston/sign_close.png
+%exclude %_datadir/weston/sign_maximize.png
+%exclude %_datadir/weston/sign_minimize.png
 
 %files devel
 %manifest %{name}.manifest