[game-data-packager] 01/01: fedora: compute specfile name only once

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit 7383368817fe6bb84185d1f479b91a253b868d77
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Tue Nov 3 14:02:04 2015 +0100

    fedora: compute specfile name only once
---
 game_data_packager/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 7dc03e0..8001645 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1435,6 +1435,7 @@ class PackagingTask(object):
                     full = os.path.join(dirpath, fn)
                     full = full[len(destdir):]
                     spec.write(full + '\n')
+        return specfile
 
     def fill_dest_dir_deb(self, package, destdir):
         debdir = os.path.join(destdir, 'DEBIAN')
@@ -2509,14 +2510,13 @@ class PackagingTask(object):
         if not self.fill_dest_dir(package, destdir):
             return None
 
-        self.fill_dest_dir_rpm(package, destdir)
+        specfile = self.fill_dest_dir_rpm(package, destdir)
         self.our_dh_fixperms(destdir)
 
         assert os.path.isdir(os.path.join(destdir, 'usr')), destdir
 
         try:
             logger.info('generating package %s', package.name)
-            specfile = os.path.join(self.get_workdir(), '%s.spec' % package.name)
             check_output(['rpmbuild', '--buildroot', destdir,
                                       '-bb', '-v', specfile],
                                       cwd=self.get_workdir())

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git