[PATCH] Make the git metapackage require the same version of the subpackages.

[PATCH] Make the git metapackage require the same version of the subpackages.

[James Bowes]

Without explicit version deps in the rpm spec file, 'yum update git'
effectively does nothing. Require explicit versions of the subpackages, so that
they get pulled in on an update.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
---
 git.spec.in |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/git.spec.in b/git.spec.in
index 3e5bebb..7f1bd5a 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -10,7 +10,15 @@ URL: 		http://kernel.org/pub/software/scm/git/
 Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
 BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git
+
+Requires:	git-core = %{version}-%{release}
+Requires:	git-svn = %{version}-%{release}
+Requires:	git-cvs = %{version}-%{release}
+Requires:	git-arch = %{version}-%{release}
+Requires:	git-email = %{version}-%{release}
+Requires:	gitk = %{version}-%{release}
+Requires:	git-gui = %{version}-%{release}
+Requires:	perl-Git = %{version}-%{release}
 
 %description
 Git is a fast, scalable, distributed revision control system with an
@@ -172,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Sun Jan 06 2008 James Bowes <jbowes@dangerouslyinc.com>
+- Make the metapackage require the same version of the subpackages.
+
 * Wed Dec 12 2007 Junio C Hamano <gitster@pobox.com>
 - Adjust htmldir to point at /usr/share/doc/git-core-$version/
 
-- 
1.5.4.rc2.1141.g437b09

Re: [PATCH] Make the git metapackage require the same version of the subpackages.

[Junio C Hamano]

James Bowes <jbowes@dangerouslyinc.com> writes:

> Without explicit version deps in the rpm spec file, 'yum update git'
> effectively does nothing. Require explicit versions of the subpackages, so that
> they get pulled in on an update.
>
> Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>

I am asking as an RPM illiterate, not questioning the validity
of what your patch does.

The approach your patch takes feels like the right way we should
have taken from the beginning.  Does this supersede the "fix" in
5587cac28be66acf5edc2a4b83b67c8cfffbc5e9 (GIT 1.5.3.1: obsolete
git-p4 in RPM spec file)?  IOW, if we had Requires for the same
version from the beginning, we wouldn't have had the problem
when we dropped git-p4 package?

Re: [PATCH] Make the git metapackage require the same version of the subpackages.

[James Bowes]

On Jan 6, 2008 3:24 PM, Junio C Hamano <gitster@pobox.com> wrote:
> James Bowes <jbowes@dangerouslyinc.com> writes:
>
> > Without explicit version deps in the rpm spec file, 'yum update git'
> > effectively does nothing. Require explicit versions of the subpackages, so that
> > they get pulled in on an update.
> >
> > Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
>
> I am asking as an RPM illiterate, not questioning the validity
> of what your patch does.
>
> The approach your patch takes feels like the right way we should
> have taken from the beginning.  Does this supersede the "fix" in
> 5587cac28be66acf5edc2a4b83b67c8cfffbc5e9 (GIT 1.5.3.1: obsolete
> git-p4 in RPM spec file)?  IOW, if we had Requires for the same
> version from the beginning, we wouldn't have had the problem
> when we dropped git-p4 package?

I believe the obsolete is still needed, as you'd need a way to tell
rpm to just get rid of git-p4 entirely.

-James

Re: [PATCH] Make the git metapackage require the same version of the subpackages.

[Junio C Hamano]

"James Bowes" <jbowes@dangerouslyinc.com> writes:

> I believe the obsolete is still needed, as you'd need a way to tell
> rpm to just get rid of git-p4 entirely.

Thanks.

I am also wondering what should happen to spec file if we were
to later re-introduce git-p4, but that is not an immediate
concern.