From 8fe640e0ed93c7f9a6d159f1186e3613b3114b88 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Fri, 10 Jan 2014 15:49:49 -0400
Subject: [PATCH] Fix buildroot using ~/rpmbuild/BUILDROOT.

This may have been a recent change in rpmbuild that caused this as the
_buildroot macro appears to be somewhat new. However it seems using topdir
accomplishes the same thing more thoroughly.
---
 src/tito/builder.py                    | 10 +++++++---
 test/functional/singleproject_tests.py | 12 ++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/tito/builder.py b/src/tito/builder.py
index 4442028..a7bcd74 100644
--- a/src/tito/builder.py
+++ b/src/tito/builder.py
@@ -269,6 +269,7 @@ class Builder(ConfigObject):
             '--define "_binary_filedigest_algorithm md5" %s %s %s --clean '
             '-ba %s' % (rpmbuild_options,
                 self._get_rpmbuild_dir_options(), define_dist, self.spec_file))
+        debug(cmd)
         try:
             output = run_command(cmd)
         except (KeyboardInterrupt, SystemExit):
@@ -429,8 +430,9 @@ class Builder(ConfigObject):
             self.ran_setup_test_specfile = True
 
     def _get_rpmbuild_dir_options(self):
-        return ('--define "_sourcedir %s" --define "_builddir %s" --define '
+        return ('--define "_topdir %s" --define "_sourcedir %s" --define "_builddir %s" --define '
             '"_srcrpmdir %s" --define "_rpmdir %s" ' % (
+            self.rpmbuild_dir,
             self.rpmbuild_sourcedir, self.rpmbuild_builddir,
             self.rpmbuild_basedir, self.rpmbuild_basedir))
 
@@ -500,8 +502,9 @@ class NoTgzBuilder(Builder):
         dir, use the git copy we create as the sources directory when
         building package so everything can be found:
         """
-        return ('--define "_sourcedir %s" --define "_builddir %s" '
+        return ('--define "_topdir %s" --define "_sourcedir %s" --define "_builddir %s" '
             '--define "_srcrpmdir %s" --define "_rpmdir %s" ' % (
+            self.rpmbuild_dir,
             self.rpmbuild_gitcopy, self.rpmbuild_builddir,
             self.rpmbuild_basedir, self.rpmbuild_basedir))
 
@@ -888,8 +891,9 @@ class UpstreamBuilder(NoTgzBuilder):
         dir, use the git copy we create as the sources directory when
         building package so everything can be found:
         """
-        return ('--define "_sourcedir %s" --define "_builddir %s" '
+        return ('--define "_topdir %s" --define "_sourcedir %s" --define "_builddir %s" '
             '--define "_srcrpmdir %s" --define "_rpmdir %s" ' % (
+            self.rpmbuild_dir,
             self.rpmbuild_sourcedir, self.rpmbuild_builddir,
             self.rpmbuild_basedir, self.rpmbuild_basedir))
 
diff --git a/test/functional/singleproject_tests.py b/test/functional/singleproject_tests.py
index 39f7758..b97d72f 100644
--- a/test/functional/singleproject_tests.py
+++ b/test/functional/singleproject_tests.py
@@ -32,7 +32,6 @@ class SingleProjectTests(TitoGitTestFixture):
 
     def tearDown(self):
         shutil.rmtree(self.repo_dir)
-        pass
 
     def test_init_worked(self):
         # Not actually running init here, just making sure it worked when
@@ -67,21 +66,22 @@ class SingleProjectTests(TitoGitTestFixture):
     def test_latest_tgz(self):
         tito("build --tgz -o %s" % self.repo_dir)
 
-    def test_tag_tgz(self):
+    def test_build_tgz_tag(self):
         tito("build --tgz --tag=%s-0.0.1-1 -o %s" % (PKG_NAME,
             self.repo_dir))
         self.assertTrue(os.path.exists(os.path.join(self.repo_dir,
             "%s-0.0.1.tar.gz" % PKG_NAME)))
 
-    def test_latest_srpm(self):
+    def test_build_latest_srpm(self):
         tito("build --srpm")
 
-    def test_tag_srpm(self):
+    def test_build_srpm_tag(self):
         tito("build --srpm --tag=%s-0.0.1-1 -o %s" % (PKG_NAME, self.repo_dir))
 
-    def test_latest_rpm(self):
+    def test_build_latest_rpm(self):
         tito("build --rpm -o %s" % self.repo_dir)
 
-    def test_tag_rpm(self):
+    def test_build_rpm_tag(self):
         tito("build --rpm --tag=%s-0.0.1-1 -o %s" % (PKG_NAME,
             self.repo_dir))
+