From 6faa36bba02906918ebc23d9b93e87dc5f47e03c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= <ertugrulerata@gmail.com>
Date: Sat, 4 Nov 2017 19:18:31 +0300
Subject: [PATCH] yali add conflicts

---
 distribution.xml                |  4 ++--
 system/installer/yali/pspec.xml | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/distribution.xml b/distribution.xml
index 53bc024438..b8be1d0afb 100644
--- a/distribution.xml
+++ b/distribution.xml
@@ -20,10 +20,10 @@
            <Package>prison-qt5</Package>
            <Package>xorg-video-modesetting</Package>
            <!--for yali -->
-           <Package>busybox-mkinitcpio</Package>
+           <!--Package>busybox-mkinitcpio</Package>
            <Package>mkinitcpio</Package>
            <Package>Calamares</Package>
-           <Package>calamares-theme-pisilinux</Package>
+           <Package>calamares-theme-pisilinux</Package-->
            <!--no longer avilable, replaced qt5-quickcontrols2-->
            <Package>qt5-quick1</Package>
            <Package>qt5-quick1-devel</Package>
diff --git a/system/installer/yali/pspec.xml b/system/installer/yali/pspec.xml
index f431250ba5..2ed94ce4a4 100644
--- a/system/installer/yali/pspec.xml
+++ b/system/installer/yali/pspec.xml
@@ -74,6 +74,10 @@
             <Dependency>droid-fonts</Dependency>
             <!-- <Dependency>cursor-theme-oxygen-white</Dependency> -->
         </RuntimeDependencies>
+        <Conflicts>
+           <Package>Calamares</Package>
+           <Package>calamares-theme-pisilinux</Package>
+        </Conflicts>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib</Path>
@@ -84,6 +88,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2017-11-04</Date>
+            <Version>3.0.4.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2017-08-12</Date>
             <Version>3.0.4.1</Version>