From: Jonathan Nieder <jrnieder@gmail.com>
To: David Aguilar <davvid@gmail.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v4 2/2] version-gen: fix versions
Date: Sun, 13 Oct 2013 22:01:04 -0700 [thread overview]
Message-ID: <20131014050104.GA25344@google.com> (raw)
In-Reply-To: <CAJDDKr5K0UjcbhUpAjHjGcEk6=E2+cAVC8-RpxY+C1atSVj-Tg@mail.gmail.com>
Hi,
David Aguilar wrote:
> Felipe Contreras <felipe.contreras@gmail.com> wrote:
>> Virtually all packaging guidelines would prefer 1.8.4~rc1, over
>> 1.8.4.rc1 or 1.8.4-rc1, so it makes sense to use that instead.
>>
>> In particular, the only packaging we provide, git.spec, generates a
>> wrong version, because git-1.8.4 < git-1.8.4.rc1, changing to ~rc1 fixes
>> the problem as it's considered newer.
A more conservative fix would be to tweak the .spec generation in the
Makefile to follow whatever the appropriate Red Hat convention is.
For example, something like this:
-- >8 --
diff --git i/Makefile w/Makefile
index 0f931a2..73bd89d 100644
--- i/Makefile
+++ w/Makefile
@@ -2385,8 +2385,9 @@ quick-install-html:
### Maintainer's dist rules
+GIT_VERSION_RPM = $(subst -rc,~rc,$(GIT_VERSION))
git.spec: git.spec.in GIT-VERSION-FILE
- sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
+ sed -e 's/@@VERSION@@/$(GIT_VERSION_RPM)/g' < $< > $@+
mv $@+ $@
GIT_TARNAME = git-$(GIT_VERSION)
-- 8< --
That way, programs that parse the git version by splitting at '.'
(there are more than a few, unfortunately) would continue to work, but
the packaging system would get the benefit of the proposed versioning
style change.
>> The same happens in dpkg.
Have you tested this? I thought the Debian packaging did not use the
GIT-VERSION-GEN generated version in this way.
[...]
> This seems related:
>
> http://lintian.debian.org/tags/rc-version-greater-than-expected-version.html
If I understand correctly, that page has an exhaustive list of affected
packages in the Debian archive and doesn't include git.
Thanks and hope that helps,
Jonathan
next prev parent reply other threads:[~2013-10-14 5:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 7:07 [PATCH v4 0/2] Version fixes and cleanups Felipe Contreras
2013-10-12 7:07 ` [PATCH v4 1/2] version-gen: cleanup Felipe Contreras
2013-10-12 7:07 ` [PATCH v4 2/2] version-gen: fix versions Felipe Contreras
2013-10-13 21:56 ` David Aguilar
2013-10-14 2:42 ` Felipe Contreras
2013-10-14 5:01 ` Jonathan Nieder [this message]
2013-10-14 5:29 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131014050104.GA25344@google.com \
--to=jrnieder@gmail.com \
--cc=davvid@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).