Christian Bricart wrote:
On Thu, Oct 10, 2002 at 05:22:43PM +0200, Buchan Milne wrote:Sylvestre Taburet wrote:Christian Bricart wrote:[..]so it should be: samba-2.2.6-0.1.rc2.1mdk ..? ^^^Not really, since: [bgmilne@bgmilne bgmilne]$ rpm -q samba-server samba-server-2.2.6-1.0.pre2.2mdk So it's right, unless you want to keep pre2 over rc2.Oh, that's true .. but now you'll keep rc2 over final .. as: 2.2.6-1.0.rc2.1mdk > 2.2.6-1mdkWe are also putting spec files in samba cvs, final from official 2.2.6 tarball will be 2.2.6-1.1mdk, packages for cooker/Mandrake will start with 2mdk, CVS builds are 2.2.6-1.0.cvs`date +%Y%m%d`.
hmm .. ok .. that will work .. but originally "1.1mdk"-naming has been for identifying updates as such.
Yes, x.ymdk is like that, but in this case we are reserving all 1.*mdk for builds from samba tarballs, so we
a)know where it's come from
b)Don't have to use Epoch tags when samba decides that they should use the date as their release number (which they did in the past).
Mandrake RPMs of final will start at 2mdk, so updates will (possibly) be 2.1mdk.
Actually, I think I found a solution, but it depends on alpha-/beta-/pre-/rc- detection, which I was working on for 3.0alpha. Of course, this won't help 2.2.6 (since it's too late already).CVS however should be "$package-0.`date +%Y%m%d`.$build"Can you find a better solution which doesn't involve builds from a tarball being 0.x releases or the use of Epoch/Serial tags, and can use the same spec file for them all? If you do, let me know.
I'll take a look at this :-)
So, I think for 3.0, we should have something like this:
3.0-0.`date +%Y%m%d`.1mdk (CVS)
3.0-0.alpha20.1mdk (my current RPM of 3.0alpha20 which I built last night)
3.0-0.beta1.1mdk (beta1)
3.0-0.pre1.1mdk
3.0-0.rc1.1mdk
3.0-1.${samba-release-number}mdk (build from samba tarball with whatever samba uses for thier PRELEASE variable)
3.0-2mdk (first Mandrake/cooker package).
The problem here though is that people running CVS build will always have to use --oldpackage with this scheme, unless the alpha/beta/pre/rc releases also use a datestamp. Opinions on this?
Not one that covers syncing Mandrake packaging CVS with the packaging in another projects CVS tree ... AFAIK, we are the first!Hasn't there be a style guide ..?
Buchan
--
|----------------Registered Linux User #182071-----------------|
Buchan Milne Mechanical Engineer, Network Manager
Cellphone * Work +27 82 472 2231 * +27 21 8828820x121
Stellenbosch Automotive Engineering http://www.cae.co.za
GPG Key http://ranger.dnsalias.com/bgmilne.asc
1024D/60D204A7 2919 E232 5610 A038 87B1 72D6 AC92 BA50 60D2 04A7
