| |
@@ -125,8 +125,8 @@
|
| |
self.override = 'eln-override'
|
| |
self._distunset = 'fedora'
|
| |
extra_rpmdefines = [
|
| |
- "--define 'el%s 1'" % macros['rhel'],
|
| |
- "--define 'rhel %s'" % macros['rhel'],
|
| |
+ "--define", "el%s 1" % macros['rhel'],
|
| |
+ "--define", "rhel %s" % macros['rhel'],
|
| |
]
|
| |
# rawhide (previously master branch)
|
| |
elif re.match(r'(rawhide|main)$', self.branch_merge):
|
| |
@@ -141,25 +141,24 @@
|
| |
raise pyrpkg.rpkgError('Could not find the release/dist from branch name '
|
| |
'%s\nPlease specify with --release' %
|
| |
self.branch_merge)
|
| |
- self._rpmdefines = ["--define '_sourcedir %s'" % self.layout.sourcedir,
|
| |
- "--define '_specdir %s'" % self.layout.specdir,
|
| |
- "--define '_builddir %s'" % self.layout.builddir,
|
| |
- "--define '_srcrpmdir %s'" % self.layout.srcrpmdir,
|
| |
- "--define '_rpmdir %s'" % self.layout.rpmdir,
|
| |
- "--define '_rpmfilename %s'" % self.layout.rpmfilename,
|
| |
- "--define 'dist %%{?distprefix}.%s'" % self._disttag,
|
| |
- "--define '%s %s'" % (self._distvar,
|
| |
- self._distval),
|
| |
- "--eval '%%undefine %s'" % self._distunset,
|
| |
- "--define '%s 1'" % self._disttag.replace(".", "_")]
|
| |
+ self._rpmdefines = ["--define", "_sourcedir %s" % self.layout.sourcedir,
|
| |
+ "--define", "_specdir %s" % self.layout.specdir,
|
| |
+ "--define", "_builddir %s" % self.layout.builddir,
|
| |
+ "--define", "_srcrpmdir %s" % self.layout.srcrpmdir,
|
| |
+ "--define", "_rpmdir %s" % self.layout.rpmdir,
|
| |
+ "--define", "_rpmfilename %s" % self.layout.rpmfilename,
|
| |
+ "--define", "dist %%{?distprefix}.%s" % self._disttag,
|
| |
+ "--define", "%s %s" % (self._distvar, self._distval),
|
| |
+ "--eval", "%%undefine %s" % self._distunset,
|
| |
+ "--define", "%s 1" % self._disttag.replace(".", "_")]
|
| |
# TODO: consider removing macro "%s 1; it has unknown/dubious functionality"
|
| |
|
| |
if self._runtime_disttag:
|
| |
if self._disttag != self._runtime_disttag:
|
| |
# This means that the runtime is known, and is different from
|
| |
# the target, so we need to unset the _runtime_disttag
|
| |
- self._rpmdefines.append("--eval '%%undefine %s'" %
|
| |
- self._runtime_disttag)
|
| |
+ self._rpmdefines.extend(["--eval", "%%undefine %s" %
|
| |
+ self._runtime_disttag])
|
| |
|
| |
if extra_rpmdefines:
|
| |
self._rpmdefines.extend(extra_rpmdefines)
|
| |
'rpmdefines' structure needs a different format after it was changed
in rpkg (RHELCMP-9241).
Also fixes some bandit security findings.
Relates: https://pagure.io/rpkg/pull-request/620
JIRA: RHELCMP-9646
Signed-off-by: Ondrej Nosek onosek@redhat.com