Hi Tzafrir,
On Wed, Dec 07, 2016 at 02:41:11PM +0100, Tzafrir Cohen wrote:
> On Sun, Dec 04, 2016 at 08:00:29PM +0100, Guido Günther wrote:
> > control: tags -1 +confirmed
> >
> > On Sun, Dec 04, 2016 at 03:20:34PM +0200, Tzafrir Cohen wrote:
> > > Package: git-buildpackage-rpm
> > > Version: 0.8.7
> > > Severity: minor
> > >
> > > Dear Maintainer,
> > >
> > > After I import a package with gbp import-srpm, I get the following tags:
> > >
> > > packaging/1.0-1 (Points to master)
> > > upstream/1.0-1 (Points to upstream)
> > >
> > > The packaging tag is OK. However the upstream tag is not what gbp
> > > buildpackage-rpm expects.
> >
> > Confirmed. The created upstream tag is not correct. I'll have a look...
>
> Here's another one. dbus-1.6.12-14.el7_2.src.rpm .
>
> Archive generated:
>
> * 972922d (HEAD -> master, tag: packaging/1%1.6.12-14) Import Downstream
> release 1:1.6.12-14
> * a2f126a (tag: upstream/1%1.6.12-14, upstream) Import Upstream version
> 1.6.12
>
> Version:
>
> Epoch: 1
> Version: 1.6.12
> Release: 14%{?dist}
>
> buildpackage-rpm looks for the tag 'upstream/1.6.12' (that is: with
> no epoch), whereas import-srpm created a tag with epoch. Which should it
> be? I suppose that the one with epoch.
In the Debian tools the upstream tags are always without epoch (since
they're a property of the Debian source package not the upstream
source). I think we should do the same for RPM (and in fact I overlooked
it when preparing the since there is one case that has an epoch
already.).
I've just pushed a fix for that.
Cheers,
-- Guido
