From 02f38ddb2e727c3871c3e2edb2a8d5070f7ea744 Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
Date: Thu, 14 Aug 2014 18:50:21 +0200
Subject: [PATCH] Tizen:Common: realign git tree with OBS project

* _link files are slightly different than recorded
* mic_bootstrap_aggregate updated for arm-x11
* qemu_aggregate updated for arm-x11

Change-Id: I8fbd52a4cbba15605f32fdcc2341e2e4f9256e8d
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
---
 Tizen:Common/cross-arm-binutils/_link                   | 12 ++++++++----
 Tizen:Common/cross-armv7hl-gcc48-icecream-backend/_link | 12 ++++++++----
 Tizen:Common/cross-armv7l-gcc48-icecream-backend/_link  | 12 ++++++++----
 Tizen:Common/libdbus/_link                              | 12 ++++++++----
 Tizen:Common/mic-bootstrap_aggregate/_aggregate         |  9 +++++----
 Tizen:Common/mic-bootstrap_aggregate/_meta              |  6 ++----
 Tizen:Common/python-libxml2/_link                       | 12 ++++++++----
 Tizen:Common/python-magic/_link                         | 12 ++++++++----
 Tizen:Common/qemu_aggregate/_aggregate                  |  2 +-
 9 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/Tizen:Common/cross-arm-binutils/_link b/Tizen:Common/cross-arm-binutils/_link
index 3c940ff..a6a9715 100644
--- a/Tizen:Common/cross-arm-binutils/_link
+++ b/Tizen:Common/cross-arm-binutils/_link
@@ -1,5 +1,9 @@
-<link package="binutils" baserev="96a5323f1ee42a34646544160480d075">
-  <patches>
-    <branch/>
-  </patches>
+<link  package="binutils" cicount="copy">
+<patches>
+  <!-- <branch /> for a full copy, default case  -->
+  <!-- <apply name="patch" /> apply a patch on the source directory  -->
+  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
+  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete>filename</delete> delete a file -->
+</patches>
 </link>
diff --git a/Tizen:Common/cross-armv7hl-gcc48-icecream-backend/_link b/Tizen:Common/cross-armv7hl-gcc48-icecream-backend/_link
index 43aca98..da79960 100644
--- a/Tizen:Common/cross-armv7hl-gcc48-icecream-backend/_link
+++ b/Tizen:Common/cross-armv7hl-gcc48-icecream-backend/_link
@@ -1,5 +1,9 @@
-<link package="gcc48" baserev="3aad609cb9c406fc510da7c14dc47c52">
-  <patches>
-    <branch/>
-  </patches>
+<link  package="gcc48" cicount="copy">
+<patches>
+  <!-- <branch /> for a full copy, default case  -->
+  <!-- <apply name="patch" /> apply a patch on the source directory  -->
+  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
+  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete>filename</delete> delete a file -->
+</patches>
 </link>
diff --git a/Tizen:Common/cross-armv7l-gcc48-icecream-backend/_link b/Tizen:Common/cross-armv7l-gcc48-icecream-backend/_link
index 43aca98..da79960 100644
--- a/Tizen:Common/cross-armv7l-gcc48-icecream-backend/_link
+++ b/Tizen:Common/cross-armv7l-gcc48-icecream-backend/_link
@@ -1,5 +1,9 @@
-<link package="gcc48" baserev="3aad609cb9c406fc510da7c14dc47c52">
-  <patches>
-    <branch/>
-  </patches>
+<link  package="gcc48" cicount="copy">
+<patches>
+  <!-- <branch /> for a full copy, default case  -->
+  <!-- <apply name="patch" /> apply a patch on the source directory  -->
+  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
+  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete>filename</delete> delete a file -->
+</patches>
 </link>
diff --git a/Tizen:Common/libdbus/_link b/Tizen:Common/libdbus/_link
index 420472e..6e35a51 100644
--- a/Tizen:Common/libdbus/_link
+++ b/Tizen:Common/libdbus/_link
@@ -1,5 +1,9 @@
-<link package="dbus" baserev="c9a168251de58c0ff1ac3de0cb9e9ac0">
-  <patches>
-    <branch/>
-  </patches>
+<link  package="dbus" cicount="copy">
+<patches>
+  <!-- <branch /> for a full copy, default case  -->
+  <!-- <apply name="patch" /> apply a patch on the source directory  -->
+  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
+  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete>filename</delete> delete a file -->
+</patches>
 </link>
diff --git a/Tizen:Common/mic-bootstrap_aggregate/_aggregate b/Tizen:Common/mic-bootstrap_aggregate/_aggregate
index 26f4e01..987cc76 100644
--- a/Tizen:Common/mic-bootstrap_aggregate/_aggregate
+++ b/Tizen:Common/mic-bootstrap_aggregate/_aggregate
@@ -1,7 +1,8 @@
 <aggregatelist>
   <aggregate project="Tizen:Common">
     <package>mic-bootstrap</package>
-    <repository source="ia32-wayland" target="arm"/>
-    <repository source="x86_64-wayland" target="arm"/>
-  </aggregate>
-</aggregatelist>
+    <binary>mic-bootstrap-x86-arm</binary>
+    <repository source="ia32-wayland" target="arm-wayland"/>
+    <repository source="ia32-x11" target="arm-x11"/>
+    </aggregate>         
+</aggregatelist>
\ No newline at end of file
diff --git a/Tizen:Common/mic-bootstrap_aggregate/_meta b/Tizen:Common/mic-bootstrap_aggregate/_meta
index b75dd0e..ce9b140 100644
--- a/Tizen:Common/mic-bootstrap_aggregate/_meta
+++ b/Tizen:Common/mic-bootstrap_aggregate/_meta
@@ -2,10 +2,8 @@
   <title/>
   <description/>
   <build>
-    <disable arch="armv7l" repository="arm-wayland"/>
     <enable arch="i586" repository="arm-wayland"/>
-    <disable arch="i586" repository="ia32-wayland"/>
-    <enable arch="x86_64" repository="arm-wayland"/>
-    <disable arch="x86_64" repository="x86_64-wayland"/>
+    <enable arch="i586" repository="arm-x11"/>
+    <disable/>
   </build>
 </package>
diff --git a/Tizen:Common/python-libxml2/_link b/Tizen:Common/python-libxml2/_link
index 8a923dc..8e73c95 100644
--- a/Tizen:Common/python-libxml2/_link
+++ b/Tizen:Common/python-libxml2/_link
@@ -1,5 +1,9 @@
-<link package="libxml2" baserev="4ba274c75e90b213bef18dbe698eb16d">
-  <patches>
-    <branch/>
-  </patches>
+<link  package="libxml2" cicount="copy">
+<patches>
+  <!-- <branch /> for a full copy, default case  -->
+  <!-- <apply name="patch" /> apply a patch on the source directory  -->
+  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
+  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete>filename</delete> delete a file -->
+</patches>
 </link>
diff --git a/Tizen:Common/python-magic/_link b/Tizen:Common/python-magic/_link
index c1d4257..4faa9ff 100644
--- a/Tizen:Common/python-magic/_link
+++ b/Tizen:Common/python-magic/_link
@@ -1,5 +1,9 @@
-<link package="file" baserev="4127a8efe0e8fc7583e6acb111bb67a5">
-  <patches>
-    <branch/>
-  </patches>
+<link  package="file" cicount="copy">
+<patches>
+  <!-- <branch /> for a full copy, default case  -->
+  <!-- <apply name="patch" /> apply a patch on the source directory  -->
+  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
+  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete>filename</delete> delete a file -->
+</patches>
 </link>
diff --git a/Tizen:Common/qemu_aggregate/_aggregate b/Tizen:Common/qemu_aggregate/_aggregate
index 049a795..3258fbf 100644
--- a/Tizen:Common/qemu_aggregate/_aggregate
+++ b/Tizen:Common/qemu_aggregate/_aggregate
@@ -12,4 +12,4 @@
     <repository source="ia32-wayland" target="arm-wayland"/>
     <repository source="ia32-x11" target="arm-x11"/>
   </aggregate>
-</aggregatelist>
+</aggregatelist>
\ No newline at end of file
-- 
2.7.4