From 21a2d463ca0470b7dda7a9e2a8643e91dfb7f1b4 Mon Sep 17 00:00:00 2001
From: Vyacheslav Barinov <v.barinov@samsung.com>
Date: Fri, 12 Sep 2014 15:32:13 +0400
Subject: [PATCH] Fixed packaging for cross-*-gcc49 packages

There was a conflict with filesystem package due to "/usr/bin" in %files
section.

Change-Id: I83f0ea412512f30a7fdff1affef6ddd842764e32
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>
---
 packaging/cross-aarch64-gcc49.spec | 2 +-
 packaging/cross-armv7hl-gcc49.spec | 2 +-
 packaging/cross-armv7l-gcc49.spec  | 2 +-
 packaging/cross-x86_64-gcc49.spec  | 2 +-
 packaging/cross.spec.sh            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 packaging/cross.spec.sh

diff --git a/packaging/cross-aarch64-gcc49.spec b/packaging/cross-aarch64-gcc49.spec
index 7f3af5e..121c701 100644
--- a/packaging/cross-aarch64-gcc49.spec
+++ b/packaging/cross-aarch64-gcc49.spec
@@ -525,7 +525,7 @@ rm -r env
 
 %files
 %defattr(-,root,root)
-%{_prefix}/bin
+%{_prefix}/bin/*
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
diff --git a/packaging/cross-armv7hl-gcc49.spec b/packaging/cross-armv7hl-gcc49.spec
index b79f459..02072fd 100644
--- a/packaging/cross-armv7hl-gcc49.spec
+++ b/packaging/cross-armv7hl-gcc49.spec
@@ -525,7 +525,7 @@ rm -r env
 
 %files
 %defattr(-,root,root)
-%{_prefix}/bin
+%{_prefix}/bin/*
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
diff --git a/packaging/cross-armv7l-gcc49.spec b/packaging/cross-armv7l-gcc49.spec
index 845af82..ba88702 100644
--- a/packaging/cross-armv7l-gcc49.spec
+++ b/packaging/cross-armv7l-gcc49.spec
@@ -525,7 +525,7 @@ rm -r env
 
 %files
 %defattr(-,root,root)
-%{_prefix}/bin
+%{_prefix}/bin/*
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
diff --git a/packaging/cross-x86_64-gcc49.spec b/packaging/cross-x86_64-gcc49.spec
index 0e3add1..db74ce2 100644
--- a/packaging/cross-x86_64-gcc49.spec
+++ b/packaging/cross-x86_64-gcc49.spec
@@ -525,7 +525,7 @@ rm -r env
 
 %files
 %defattr(-,root,root)
-%{_prefix}/bin
+%{_prefix}/bin/*
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
diff --git a/packaging/cross.spec.sh b/packaging/cross.spec.sh
old mode 100644
new mode 100755
index 669390e..8f43c4c
--- a/packaging/cross.spec.sh
+++ b/packaging/cross.spec.sh
@@ -172,7 +172,7 @@ rm -r env
 
 %files
 %defattr(-,root,root)
-%{_prefix}/bin
+%{_prefix}/bin/*
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-- 
2.7.4