git-core-foo -> git-foo, except the core package
PATCH 1/1 git-core-foo -> git-foo, except the core package
This patch renames the tarball "git" rather than "git-core", and changes the names of various packages from git-core-foo to git-foo. git-core is still the true core package; an empty RPM package named "git" pulls in ALL the git packages -- this makes updates work correctly, and allows "yum install git" to do the obvious thing.
It also renames the git-(core-)tk package to gitk.
Makefile +7 -7
@@ -446,20 +446,20 @@ install-doc: ### Maintainer's dist rules -git-core.spec: git-core.spec.in Makefile +git.spec: git.spec.in Makefile sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@ -GIT_TARNAME=git-core-$(GIT_VERSION) -dist: git-core.spec git-tar-tree +GIT_TARNAME=git-$(GIT_VERSION) +dist: git.spec git-tar-tree ./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar @mkdir -p $(GIT_TARNAME) - @cp git-core.spec $(GIT_TARNAME) - $(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec + @cp git.spec $(GIT_TARNAME) + $(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git.spec @rm -rf $(GIT_TARNAME) gzip -f -9 $(GIT_TARNAME).tar rpm: dist - $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz + $(RPMBUILD) -ta $(GIT_TARNAME).tar.gz deb: dist rm -rf $(GIT_TARNAME)
@@ -472,7 +472,7 @@ deb: dist clean: rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE) rm -f $(filter-out gitk,$(SCRIPTS)) - rm -f git-core.spec *.pyc *.pyo + rm -f *.spec *.pyc *.pyo rm -rf $(GIT_TARNAME) rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz rm -f git-core_$(GIT_VERSION)-*.dsc
git-core.spec.in deleted +0 -164
164 lines not on this page · raw message
git.spec.in new file +188 -0
188 lines not on this page · raw message
Quoted 5 lines · H. Peter Anvin
This patch renames the tarball "git" rather than "git-core", and changes the names of various packages from git-core-foo to git-foo. git-core is still the true core package; an empty RPM package named "git" pulls in ALL the git packages -- this makes updates work correctly, and allows "yum install git" to do the obvious thing.
What about "yum remove git" ? I don't think that will work quite so well. The "git" package will be removed just fine since nothing depends on it, but git-<foo> will still remain. Maybe not that big of a deal, but it might not be obvious to some.
Also, what about http://www.gnu.org/software/git/git.html ? I seem to recall that was the reason the name git-core was used in the first place.
josh
Quoted 8 lines · Josh Boyer
Quoted 5 lines · H. Peter Anvin
This patch renames the tarball "git" rather than "git-core", and changes the names of various packages from git-core-foo to git-foo. git-core is still the true core package; an empty RPM package named "git" pulls in ALL the git packages -- this makes updates work correctly, and allows "yum install git" to do the obvious thing.
Quoted 4 lines
What about "yum remove git" ? I don't think that will work quite so well. The "git" package will be removed just fine since nothing depends on it, but git-<foo> will still remain. Maybe not that big of a deal, but it might not be obvious to some.
True. If you have a solution to that, I'd love to hear it. Note that having the core package depend on everything else is not acceptable.
Quoted 3 lines
Also, what about http://www.gnu.org/software/git/git.html ? I seem to recall that was the reason the name git-core was used in the first place.
It's changing its name to "gitfm".
-hpa
Quoted 9 lines · H. Peter Anvin
Quoted 8 lines · Josh Boyer
Quoted 5 lines · H. Peter Anvin
This patch renames the tarball "git" rather than "git-core", and changes the names of various packages from git-core-foo to git-foo. git-core is still the true core package; an empty RPM package named "git" pulls in ALL the git packages -- this makes updates work correctly, and allows "yum install git" to do the obvious thing.
Quoted 7 lines
Quoted 4 lines
What about "yum remove git" ? I don't think that will work quite so well. The "git" package will be removed just fine since nothing depends on it, but git-<foo> will still remain. Maybe not that big of a deal, but it might not be obvious to some.
True. If you have a solution to that, I'd love to hear it. Note that having the core package depend on everything else is not acceptable.
%preun section that does rpm -e of the packages it brings in. But that is a hack that would cause some to become violently ill. Perhaps it's an issue not worth worrying about.
Quoted 6 lines
Quoted 4 lines
Also, what about http://www.gnu.org/software/git/git.html ? I seem to recall that was the reason the name git-core was used in the first place.
It's changing its name to "gitfm".
Sweet.
josh
Quoted 9 lines · Josh Boyer
Quoted 7 lines · H. Peter Anvin
Quoted 4 lines · Josh Boyer
What about "yum remove git" ? I don't think that will work quite so well. The "git" package will be removed just fine since nothing depends on it, but git-<foo> will still remain. Maybe not that big of a deal, but it might not be obvious to some.
Quoted 8 lines
Quoted 2 lines
True. If you have a solution to that, I'd love to hear it. Note that having the core package depend on everything else is not acceptable.
%preun section that does rpm -e of the packages it brings in. But that is a hack that would cause some to become violently ill. Perhaps it's an issue not worth worrying about.
Less puky while bringing some obviousity:
%preun
echo "To get rid of git completely, yada yada (real instructions)."
Signature · 3 lines
Andreas Ericsson [email protected] OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231
Quoted 8 lines · Josh Boyer
Quoted 3 lines
True. If you have a solution to that, I'd love to hear it. Note that having the core package depend on everything else is not acceptable.
%preun section that does rpm -e of the packages it brings in. But that is a hack that would cause some to become violently ill. Perhaps it's an issue not worth worrying about.
%postun, but yes, that sounds pretty sick to me. The Fedora people might disagree, in which case let them lead and we can follow suit.
-hpa