Modifies package and build to work with multiple sourceballs

2 files changed, 9 insertions, 2 deletions

diff --git a/modules/build.py b/modules/build.py
index 338f635..1eba2da 100644
--- a/modules/build.py
+++ b/modules/build.py
@@ -49,8 +49,8 @@ class Build(Directory):
         with pwd(pkg.dir):
             symlink(pkg.spec_file,
                     join(self.dir, 'SPECS', pkg.spec_file))
-            sball = pkg.sourceball
-            symlink(sball, join(self.dir, 'SOURCES', sball))
+            for sball in pkg.sourceballen:
+                symlink(sball, join(self.dir, 'SOURCES', sball))
             patches = [f for f in listdir(getcwd()) if f.endswith('.patch')]
             for patch in patches:
                 symlink(patch, join(self.dir, 'SOURCES', patch))
@@ -126,6 +126,7 @@ class Build(Directory):
 
         target_dir is a path to the destination for all the rpms
         '''
+        target_dir = abspath(target_dir)
         with pwd(self.dir):
             for path, dirs, files in walk('.'):
                 for f in files:
diff --git a/modules/package.py b/modules/package.py
index bf1e3ec..2e46add 100644
--- a/modules/package.py
+++ b/modules/package.py
@@ -124,10 +124,16 @@ class Package(Directory):
     def fetch_sourceballs(self, profile=None):
         pkg_srcen = self.sources
         pkg_srcen = (DirFactory(pkg_src) for pkg_src in pkg_srcen)
+        self.cfg['sourceballen'] = list()
         with pwd(self.dir):
             for pkg_src in pkg_srcen:
                 pkg_src.setup_sourceball(self.ver(profile))
                 symlink(pkg_src.sourceball_loc, pkg_src.sourceball)
+                self.cfg['sourceballen'].append(pkg_src.sourceball)
+
+    @property
+    def sourceballen(self):
+        return self.cfg['sourceballen']
 
 # These don't make sense anymore
 # TODO: Figure out the API to iterate over PackageSources where *args should be diff for each one