From 368fa1ff32009daa405990967b6e8eef8a228066 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Feb 20 2018 21:17:54 +0000
Subject: Merge #512 `Update Rawhide config to build a modular variant`


---

diff --git a/fedora.conf b/fedora.conf
index cc2b8b8..20f2049 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -46,8 +46,12 @@ pkgset_koji_inherit = False
 filter_system_release_packages = False
 
 # GATHER
-gather_source = 'comps'
-gather_method = 'deps'
+gather_method = {
+    '^.*': {                # For all variants
+        'comps': 'deps',    # resolve dependencies for packages from comps file
+        'module': 'nodeps', # but not for packages from modules
+    }
+}
 gather_backend = 'dnf'
 gather_profiler = True
 check_deps = False
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 4e906e7..31e09f9 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -175,4 +175,23 @@
           <environment display_order="10">cloud-server-environment</environment>
         </environments>
     </variant>
+    <variant id="Modular" name="Modular" type="variant">
+        <arches>
+            <arch>armhfp</arch>
+            <arch>aarch64</arch>
+            <arch>i386</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
+            <arch>x86_64</arch>
+        </arches>
+        <modules>
+            <module>django-1.6</module>
+            <module>reviewboard-2.5</module>
+            <module>reviewboard-3.0</module>
+            <module>nodejs-6</module>
+            <module>nodejs-8</module>
+            <module>nodejs-9</module>
+        </modules>
+    </variant>
 </variants>