From 9ba6e20f15558d1bfb5abf5573a117b13ee9f307 Mon Sep 17 00:00:00 2001 From: clime Date: May 01 2021 18:15:44 +0000 Subject: _sourcedir should possibly be set to pkg_path when parsing spec --- diff --git a/rpkglib/rpm_package.py b/rpkglib/rpm_package.py index e12ab6c..f88da8d 100644 --- a/rpkglib/rpm_package.py +++ b/rpkglib/rpm_package.py @@ -125,6 +125,8 @@ class RpmPackage(object): % (prefix, self.base_output_path)) def load_rpm_config(self): + rpm.addMacro('_sourcedir', self.pkg_path) + if self.version_bump or self.release_bump: for rpmdefine in self.bump_rpmdefines: name, expr = rpmdefine.split() @@ -146,6 +148,9 @@ class RpmPackage(object): return rpm_opts + def rpm_parse_opts(self): + return [ '--define', '_sourcedir %s' % self.pkg_path ] + self.rpm_opts() + def rpmbuild_opts(self): rpmbuild_opts = [ '--define', '_sourcedir %s' % self.outdir, @@ -177,7 +182,7 @@ class RpmPackage(object): def nvre(self): """Get name, version, release, epoch of the package.""" - cmd = ['rpm'] + self.rpm_opts() + cmd = ['rpm'] + self.rpm_parse_opts() final_tmp_spec_path = self.final_tmp_spec() # We put the question tag delimiters into our query so that @@ -351,7 +356,7 @@ class RpmPackage(object): ######################## commands ######################## def clog(self, raw=False): - cmd = ['rpm'] + self.rpm_opts() + cmd = ['rpm'] + self.rpm_parse_opts() final_tmp_spec_path = self.final_tmp_spec() cmd.extend(['-q', '--qf', '%{CHANGELOGTEXT}??',