[Ovirt-devel] [PATCH node] Restructured makefile and rpmbuilding to simplify it

[Daniel P. Berrange]

On Fri, Sep 19, 2008 at 01:49:38PM +0200, Alan Pevec wrote:
> Daniel P. Berrange wrote:
> >>+Version:        @VERSION@
> >>+Release:        0%{?git_release}%{?dist}%{?extra_release}
> >
> >Do you need the %git_release bit to be in front of the %dist tag ? I'd
> >guess not because %dist is basically a constant for any one developer's
> >build host. The %git_release & %extra_release are essentially serviing
> >the same purpose - append a unique extra token - the latter is used by
> >autobuild. So we could simplify it tiny a little by just merging the
> >two tags:
> >
> >    Release:        0%{?dist}%{?extra_release}
> >
> >and then just set %extra_release to contain the current %git_release data
> >when calling it in the Makefile.am.
> 
> I suggested git_release to be closer to 
> http://fedoraproject.org/wiki/Packaging/NamingGuidelines#Pre-Release_packages
> >Release Tag for Pre-Release Packages: 0.%{X}.%{alphatag}
> 
> and http://fedoraproject.org/wiki/Packaging/DistTag
> >append %{?dist} to the end
> 
> I couldn't find guideline about extra_release.

The guidelines aren't directly relevant to this scenario, since we're
only doing this for local developer / automated builds, not stuff we
put into public repositories. So the only requirement is that we have
an incrementing release number each time we build. Since %dist is in
effect a constant, it doesn't matter what side it comes anyway.
So in essence all I'm saying is that get rid of %git_release in the
spec and replace the calls

  rpmbuild --define 'git_release XYZ'

with 

  rpmbuild --define 'extra_release XYZ'

Since, we already have the extra_release bit present for autobuild which
is serving the same purpose of appending a unique, incrementing timestamp.

Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|