Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e0a18224b18ef55872d355bc99780c24005ea53f
commit e0a18224b18ef55872d355bc99780c24005ea53f Author: DeX77 <[email protected]> Date: Thu Nov 5 21:11:20 2015 +0100 + add docker to replaces (i686 only) diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index 359a4f1..04873cc 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -165,6 +165,10 @@ replaces=("${replaces[@]}" 'keystone' 'nova' 'python-d2to1' 'python-glanceclient ## e17 remove after 2.1 replaces=("${replaces[@]}" 'ecore' 'edje' 'eeze' 'eina' 'elementary' 'emotion' 'ephoto' 'evas' 'ewebkit' 'exquisite' \ 'e_dbus' 'eet' 'efreet' 'eio' 'embryo' 'enlightenment' 'ethumb' 'evas_generic_loaders' 'expedite' 'terminology') + +# i686 only +[ "$CARCH" == "i686" ] && replaces=("${replaces[@]}" 'docker') + conflicts=("${replaces[@]}") provides=("${provides[@]}") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
