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 33293b5b00ec06ff813d8fc310b607b40f9da1ed..85932bf12de89439beb1dc0aead4650b4b8ef47f 100644 (file)
--- 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 9408983f73dc753545e29d168263b563276f0edf..788646b17dcf2279b0ecb682aa0010dda290fe6b 100644 (file)
--- 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",