summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-02-25 11:11:51 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-02-25 11:11:51 +0200
commitd07026be9fe043d6e7c500e1299bfeba37ead067 (patch)
tree30f810144223dc7b8bf0084c462929c21381473e
parentc8a8b323f671d893575177e084afefe612990f00 (diff)
downloadgit-buildpackage-d07026be9fe043d6e7c500e1299bfeba37ead067.tar.gz
git-buildpackage-d07026be9fe043d6e7c500e1299bfeba37ead067.tar.bz2
git-buildpackage-d07026be9fe043d6e7c500e1299bfeba37ead067.zip
rpm-ch: update packaging-dir from spec file location
So that the changelog is searched/created in the correct directory. Change-Id: I6c6db01da2be566101cd7b547a60902ef92ec779 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-xgbp/scripts/rpm_changelog.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/scripts/rpm_changelog.py b/gbp/scripts/rpm_changelog.py
index ead967bf..7057a733 100755
--- a/gbp/scripts/rpm_changelog.py
+++ b/gbp/scripts/rpm_changelog.py
@@ -139,11 +139,11 @@ def parse_spec_file(repo, options):
"""Find and parse spec file"""
if options.spec_file != 'auto':
spec_path = os.path.join(repo.path, options.spec_file)
- options.packaging_dir = os.path.dirname(spec_path)
spec = SpecFile(spec_path)
else:
spec = guess_spec(os.path.join(repo.path, options.packaging_dir),
True, os.path.basename(repo.path) + '.spec')
+ options.packaging_dir = spec.specdir
return spec