diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | git.spec.in (renamed from git-core.spec.in) | 36 |
2 files changed, 37 insertions, 13 deletions
@@ -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 diff --git a/git-core.spec.in b/git.spec.in index 16c6269..96dfc1d 100644 --- a/git-core.spec.in +++ b/git.spec.in @@ -1,5 +1,5 @@ # Pass --without docs to rpmbuild if you don't want the documentation -Name: git-core +Name: git Version: @@VERSION@@ Release: 1%{?dist} Summary: Git core and tools @@ -9,7 +9,7 @@ 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: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -19,6 +19,22 @@ distributed source code management system. This package includes rudimentary tools that can be used as a SCM, but you should look elsewhere for tools for ordinary humans layered on top of this. +This is a dummy package which brings in all subpackages. + +%package core +Summary: Core git tools +Group: Development/Tools +Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat +%description core +This is a stupid (but extremely fast) directory content manager. It +doesn't do a whole lot, but what it _does_ do is track directory +contents efficiently. It is intended to be the base of an efficient, +distributed source code management system. This package includes +rudimentary tools that can be used as a SCM, but you should look +elsewhere for tools for ordinary humans layered on top of this. + +These are the core tools with minimal dependencies. + %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools @@ -47,11 +63,11 @@ Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%package tk +%package -n gitk Summary: Git revision tree visualiser ('gitk') Group: Development/Tools Requires: git-core = %{version}-%{release}, tk >= 8.4 -%description tk +%description -n gitk Git revision tree visualiser ('gitk') %prep @@ -75,6 +91,9 @@ make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease WIT %clean rm -rf $RPM_BUILD_ROOT +%files +# These are no files in the root package + %files svn %defattr(-,root,root) %{_bindir}/*svn* @@ -103,20 +122,25 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%files tk +%files -n gitk %defattr(-,root,root) %doc Documentation/*gitk*.txt %{_bindir}/*gitk* %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } -%files -f bin-man-doc-files +%files core -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Nov 14 2005 H. Peter Anvin <hpa@zytor.com> 0.99.9j-1 +- Change subpackage names to git-<name> instead of git-core-<name> +- Create empty root package which brings in all subpackages +- Rename git-tk -> gitk + * Thu Nov 10 2005 Chris Wright <chrisw@osdl.org> 0.99.9g-1 - zlib dependency fix - Minor cleanups from split |