From 8fb89a8090b165fd83ff929bbe126223cec8c34b Mon Sep 17 00:00:00 2001
From: Dominika Hodovska <dhodovsk@redhat.com>
Date: Jun 13 2017 14:06:42 +0000
Subject: [PATCH 1/4] Fill api with input packages


---

diff --git a/modularity/module_generator.py b/modularity/module_generator.py
index 5710ac2..4003675 100644
--- a/modularity/module_generator.py
+++ b/modularity/module_generator.py
@@ -47,6 +47,9 @@ class ModuleGenerator(object):
 
             self.mmd.add_content_license(str(self.pkg.license))
 
+        for pkg in ModuleDepsDiffer.whatprovides(self.pkgs):
+            self.mmd.api.add_rpm(pkg)
+
         for pkg in self.build_deps.intersection(self.run_deps):
             self.mmd.components.add_rpm(pkg, "Build and runtime dependency.")
 

From 7116b883b73799c65490eb2a86054feab8d2d261 Mon Sep 17 00:00:00 2001
From: Dominika Hodovska <dhodovsk@redhat.com>
Date: Jun 13 2017 14:06:42 +0000
Subject: [PATCH 2/4] Fill filter tag


---

diff --git a/modularity/module_generator.py b/modularity/module_generator.py
index 4003675..788cbda 100644
--- a/modularity/module_generator.py
+++ b/modularity/module_generator.py
@@ -50,6 +50,9 @@ class ModuleGenerator(object):
         for pkg in ModuleDepsDiffer.whatprovides(self.pkgs):
             self.mmd.api.add_rpm(pkg)
 
+        for pkg in (self.build_deps - self.mmd.api.rpms - self.run_deps):
+            self.mmd.filter.add_rpm(pkg)
+
         for pkg in self.build_deps.intersection(self.run_deps):
             self.mmd.components.add_rpm(pkg, "Build and runtime dependency.")
 

From 502edb2712acacb02b854098ea73b7f76df73676 Mon Sep 17 00:00:00 2001
From: Dominika Hodovska <dhodovsk@redhat.com>
Date: Jun 13 2017 14:06:42 +0000
Subject: [PATCH 3/4] Set higher buildorder of api components


---

diff --git a/modularity/module_generator.py b/modularity/module_generator.py
index 788cbda..d23fdf4 100644
--- a/modularity/module_generator.py
+++ b/modularity/module_generator.py
@@ -54,13 +54,13 @@ class ModuleGenerator(object):
             self.mmd.filter.add_rpm(pkg)
 
         for pkg in self.build_deps.intersection(self.run_deps):
-            self.mmd.components.add_rpm(pkg, "Build and runtime dependency.")
+            self.mmd.components.add_rpm(pkg, "Build and runtime dependency.", buildorder=self._get_build_order(pkg))
 
         for pkg in (self.build_deps - self.run_deps):
-            self.mmd.components.add_rpm(pkg, "Build dependency.")
+            self.mmd.components.add_rpm(pkg, "Build dependency.", buildorder=self._get_build_order(pkg))
 
         for pkg in (self.run_deps - self.build_deps):
-            self.mmd.components.add_rpm(pkg, "Runtime dependency.")
+            self.mmd.components.add_rpm(pkg, "Runtime dependency.", buildorder=self._get_build_order(pkg))
 
         for mod, caps in self.differ.build_caps_classified.items():
             if mod == 'result':
@@ -77,6 +77,12 @@ class ModuleGenerator(object):
                 name, stream = self.differ.get_module_name(mod).split(':')
                 self.mmd.add_requires(name, stream)
 
+    def _get_build_order(self, pkg):
+        if pkg in self.mmd.api.rpms:
+            return 10
+        else:
+            return 0
+
     def _get_pkg_info(self):
         """
             Function loads package from dnf

From d9ac4c6517983740dc7781f95a27571d70224848 Mon Sep 17 00:00:00 2001
From: Dominika Hodovska <dhodovsk@redhat.com>
Date: Jun 13 2017 14:49:48 +0000
Subject: [PATCH 4/4] Convert source packages to ascii


---

diff --git a/modularity/module_deps_differ.py b/modularity/module_deps_differ.py
index 9bd5e9f..a6e32e6 100755
--- a/modularity/module_deps_differ.py
+++ b/modularity/module_deps_differ.py
@@ -32,7 +32,7 @@ def get_pkgs_source_rpm_name(pkg):
         source_rpm_name = source_rpm.rsplit('-', 2)[0]
     else:
         source_rpm_name = pkg.source_name
-    return source_rpm_name
+    return source_rpm_name.encode('ascii', 'ignore')
 
 
 def get_pdc_client():