From 54bb5bec7a025eecb51f85274ec37dbd0c478758 Mon Sep 17 00:00:00 2001 From: Luis Pabon Date: Mon, 19 Aug 2013 14:59:30 -0400 Subject: Fix spec file to support source rpms Our initial implementation only required Jenkins to export binary RPMs, but as we move foward, we really need to also export SRPMs. To support SRPMs, the spec file in the RPM has to have the correct NAME, VERSION, and RELEASE information. Change-Id: Icd7132b4aafdbe7a1f02a35d0be7ad63b2e7c056 Signed-off-by: Luis Pabon Reviewed-on: http://review.gluster.org/5669 Reviewed-by: Peter Portante Reviewed-by: Kaleb KEITHLEY Tested-by: Peter Portante Reviewed-on: http://review.gluster.org/5679 --- gluster/swift/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gluster') diff --git a/gluster/swift/__init__.py b/gluster/swift/__init__.py index 66397a6..4af47a2 100644 --- a/gluster/swift/__init__.py +++ b/gluster/swift/__init__.py @@ -17,8 +17,9 @@ class PkgInfo(object): - def __init__(self, canonical_version, name, final): + def __init__(self, canonical_version, release, name, final): self.canonical_version = canonical_version + self.release = release self.name = name self.final = final @@ -28,8 +29,9 @@ class PkgInfo(object): a bash script. """ with open(filename, 'w') as fd: - fd.write("PKG_NAME=%s\n" % self.name) - fd.write("PKG_VERSION=%s\n" % self.canonical_version) + fd.write("NAME=%s\n" % self.name) + fd.write("VERSION=%s\n" % self.canonical_version) + fd.write("RELEASE=%s\n" % self.release) @property def pretty_version(self): @@ -42,6 +44,6 @@ class PkgInfo(object): ### ### Change the Package version here ### -_pkginfo = PkgInfo('1.8.0', 'glusterfs-openstack-swift', False) +_pkginfo = PkgInfo('1.8.0', '7', 'glusterfs-openstack-swift', False) __version__ = _pkginfo.pretty_version __canonical_version__ = _pkginfo.canonical_version -- cgit