diff options
author | Jesse Keating <jkeating@redhat.com> | 2010-08-11 22:32:09 -0700 |
---|---|---|
committer | Jesse Keating <jkeating@redhat.com> | 2010-08-11 22:32:09 -0700 |
commit | 8b08ba8cf7b45e2ecb5e0959433ee998cdd2b59b (patch) | |
tree | c5c852b46ae70c48a448d848b45c3dd1338620de /src/pyfedpkg | |
parent | 493198a832ffbc240681c088fe1f92bc3077ed93 (diff) | |
download | fedora-packager-8b08ba8cf7b45e2ecb5e0959433ee998cdd2b59b.tar.gz fedora-packager-8b08ba8cf7b45e2ecb5e0959433ee998cdd2b59b.tar.xz fedora-packager-8b08ba8cf7b45e2ecb5e0959433ee998cdd2b59b.zip |
Fix dist related PackageModule.rpmdefines items
This is from Hans Ulrich Niedermann <hun@n-dimensional.de> but it didn't
apply to my tree so I reproduced it by hand.
Diffstat (limited to 'src/pyfedpkg')
-rw-r--r-- | src/pyfedpkg/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index 269fe9d..4863b67 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -818,19 +818,19 @@ class PackageModule: if self.branch.startswith('f'): self.distval = self.branch.split('f')[1] self.distvar = 'fedora' - self.dist = '.fc%s' % self.distval + self.dist = 'fc%s' % self.distval self.target = 'dist-f%s-updates-candidate' % self.distval self.mockconfig = 'fedora-%s-%s' % (self.distval, self.localarch) elif self.branch.startswith('el'): self.distval = self.branch.split('el')[1] self.distvar = 'epel' - self.dist = '.el%s' % self.distval + self.dist = 'el%s' % self.distval self.target = 'dist-%sE-epel-testing-candidate' % self.distval self.mockconfig = 'epel-%s-%s' % (self.distval, self.localarch) elif self.branch.startswith('olpc'): self.distval = self.branch.split('olpc')[1] self.distvar = 'olpc' - self.dist = '.olpc%s' % self.distval + self.dist = 'olpc%s' % self.distval self.target = 'dist-olpc%s' % self.distval # If we don't match one of the above, assume master or a branch of # master @@ -846,8 +846,8 @@ class PackageModule: "--define '_builddir %s'" % path, "--define '_srcrpmdir %s'" % path, "--define '_rpmdir %s'" % path, - "--define 'dist %s'" % self.dist, - "--define '%s %s'" % (self.distvar, self.distval), + "--define 'dist .%s'" % self.dist, + "--define '%s 1'" % self.dist, "--define '%s 1'" % self.distvar] self.ver = self.getver() self.rel = self.getrel() |