diff --git a/cloud.spec b/cloud.spec index ee3fd15b042..0254b36f8b9 100644 --- a/cloud.spec +++ b/cloud.spec @@ -4,14 +4,12 @@ # DISABLE the post-percentinstall java repacking and line number stripping # we need to find a way to just disable the java repacking and line number stripping, but not the autodeps -%define _rel 1 - Name: cloud Summary: Cloud.com Stack Version: %{_ver} #http://fedoraproject.org/wiki/PackageNamingGuidelines#Pre-Release_packages %if "%{?_prerelease}" != "" -Release: 0.%{_build_number}%{_prerelease}%{dist} +Release: 0.%{_build_number}%{dist} %else Release: %{_rel}%{dist} %endif diff --git a/wscript b/wscript index 858117e8697..a1c5b450f28 100644 --- a/wscript +++ b/wscript @@ -443,6 +443,10 @@ def set_options(opt): help = 'package version', default = '', dest = 'VERNUM') + rpmopts.add_option('--release-version', + help = 'release version', + default = '', + dest = 'RELEASENUM') rpmopts.add_option('--prerelease', help = 'Branch name to append to the release number (if specified, alter release number to be a prerelease); this option requires --build-number=X [Default: nothing]', default = '', @@ -587,6 +591,12 @@ def rpm(context): prerelease = ["--define","_prerelease %s"%Options.options.PRERELEASE] else: prerelease = [] + if Options.options.RELEASENUM: + release = Options.options.RELEASENUM + else: release = "1" + + releasever = ["--define", "_rel %s" % release] + if Options.options.VERNUM: ver = Options.options.VERNUM else: ver = "2.2" @@ -606,8 +616,8 @@ def rpm(context): shutil.move(tarball,_join(sourcedir,tarball)) specfile = "%s.spec"%APPNAME - checkdeps = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"--nobuild",specfile]+packagever) - dorpm = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"-bb",specfile]+buildnumber+prerelease+packagever) + checkdeps = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"--nobuild",specfile]+packagever+releasever) + dorpm = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"-bb",specfile]+buildnumber+prerelease+packagever+releasever) try: checkdeps() except (CalledProcessError,OSError),e: Utils.pprint("YELLOW","Dependencies might be missing. Trying to auto-install them...")