From: Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
Date: Fri, 2 Oct 2015 13:33:02 +0000 (-0400)
Subject: Turn on Fedora-specific behaviors in libsolv for Mageia for DNF
X-Git-Tag: 0.6.15~18^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ed0266ae2111e84d7619b314ddfd822870b648f;p=thirdparty%2Flibsolv.git

Turn on Fedora-specific behaviors in libsolv for Mageia for DNF

Consistent with work to enable DNF for Mageia as an alternate
repository manager, definitions expected by hawkey from libsolv
need to be set for the MAGEIA definition as well.

For more information on the work to enable DNF for Mageia, see
https://wiki.mageia.org/en/Feature:Add_DNF_as_Alternate_Repository_Manager
---

diff --git a/src/pool.c b/src/pool.c
index 33293b5b..85932bf1 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -82,7 +82,7 @@ pool_create(void)
   s->evr = ID_EMPTY;
 
   pool->debugmask = SOLV_DEBUG_RESULT;	/* FIXME */
-#ifdef FEDORA
+#if defined(FEDORA) || defined(MAGEIA)
   pool->implicitobsoleteusescolors = 1;
 #endif
 #ifdef RPM5
diff --git a/src/poolarch.c b/src/poolarch.c
index 9408983f..788646b1 100644
--- a/src/poolarch.c
+++ b/src/poolarch.c
@@ -21,7 +21,7 @@
 #include "util.h"
 
 static const char *archpolicies[] = {
-#ifdef FEDORA
+#if defined(FEDORA) || defined(MAGEIA)
   "x86_64",	"x86_64:athlon:i686:i586:i486:i386",
 #else
   "x86_64",	"x86_64:i686:i586:i486:i386",
@@ -64,7 +64,7 @@ static const char *archpolicies[] = {
   "mips64",	"mips64",
   "mips64el",	"mips64el",
   "m68k",	"m68k",
-#ifdef FEDORA
+#if defined(FEDORA) || defined(MAGEIA)
   "ia32e",	"ia32e:x86_64:athlon:i686:i586:i486:i386",
   "athlon",	"athlon:i686:i586:i486:i386",
   "amd64",	"amd64:x86_64:athlon:i686:i586:i486:i386",