mirror of
https://git.centos.org/centos/centpkg.git
synced 2025-02-23 08:12:55 +00:00
undefine fedora in rpmdefines section
resolves centpkg issue #111 Signed-off-by: Troy Dawson <tdawson@redhat.com>
This commit is contained in:
parent
286c22d246
commit
441ee7a696
1 changed files with 4 additions and 0 deletions
|
@ -217,6 +217,7 @@ class Commands(Commands):
|
|||
self._distvar = self.distgitdir.centosversion
|
||||
self._distval = self._distvar.replace(".", "_")
|
||||
|
||||
self._distunset = 'fedora'
|
||||
self._disttag = "el%s" % self._distval
|
||||
self._rpmdefines = [
|
||||
"--define",
|
||||
|
@ -237,6 +238,9 @@ class Commands(Commands):
|
|||
# This is so the rhel macro is set for spec files
|
||||
"--define",
|
||||
"rhel %s" % self._distval.split("_")[0],
|
||||
# This is so the fedora macro is unset for spec files
|
||||
"--eval",
|
||||
"%%undefine %s" % self._distunset,
|
||||
]
|
||||
self.log.debug("RPMDefines: %s" % self._rpmdefines)
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue